common: Split out metrics utils from utils.cc.
The utility functions to convert error codes and network settings to
the types defined by the metrics framework are split out the utils.cc
file. These tools are only used by the update_engine daemon to report
back metrics on an update check.
Bug: 25197634
Test: FEATURES=test emerge-link update_engine; mma
Change-Id: I589dc9f6056fb1399fa84ca4f44076ed3a6b5365
diff --git a/omaha_request_action.cc b/omaha_request_action.cc
index 7a269f8..17aa62b 100644
--- a/omaha_request_action.cc
+++ b/omaha_request_action.cc
@@ -40,6 +40,8 @@
#include "update_engine/common/prefs_interface.h"
#include "update_engine/common/utils.h"
#include "update_engine/connection_manager.h"
+#include "update_engine/metrics.h"
+#include "update_engine/metrics_utils.h"
#include "update_engine/omaha_request_params.h"
#include "update_engine/p2p_manager.h"
#include "update_engine/payload_state_interface.h"
@@ -1417,7 +1419,8 @@
// We report two flavors of errors, "Download errors" and "Parsing
// error". Try to convert to the former and if that doesn't work
// we know it's the latter.
- metrics::DownloadErrorCode tmp_error = utils::GetDownloadErrorCode(code);
+ metrics::DownloadErrorCode tmp_error =
+ metrics_utils::GetDownloadErrorCode(code);
if (tmp_error != metrics::DownloadErrorCode::kInputMalformed) {
result = metrics::CheckResult::kDownloadError;
download_error_code = tmp_error;