Move statistics_provider to chromeos/system

chrome/browser/policy/browser_policy_connector.cc

Index: chrome/browser/policy/browser_policy_connector.cc
diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc
index 76bdac29a9a8196522ffe49f4dc4cab4049bd69e..abf193474221036a504ce5d1d2ac8d3c9694c2e4 100644
--- a/chrome/browser/policy/browser_policy_connector.cc
+++ b/chrome/browser/policy/browser_policy_connector.cc
@@ -21,7 +21,6 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/sys_info.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/policy/async_policy_provider.h"
 #include "chrome/browser/policy/cloud/cloud_policy_client.h"
@@ -69,7 +68,6 @@
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/cros_settings_provider.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
-#include "chrome/browser/chromeos/system/statistics_provider.h"
 #include "chrome/browser/chromeos/system/timezone_settings.h"
 #include "chromeos/chromeos_paths.h"
 #include "chromeos/chromeos_switches.h"
@@ -78,6 +76,7 @@
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/network/network_handler.h"
 #include "chromeos/network/onc/onc_certificate_importer_impl.h"
+#include "chromeos/system/statistics_provider.h"
 #endif
 
 using content::BrowserThread;
@@ -138,41 +137,6 @@ std::string GetUserAgentParameter() {
                             version_info.LastChange().c_str());
 }
 
-std::string GetPlatformParameter() {
-  std::string os_name = base::SysInfo::OperatingSystemName();
-  std::string os_hardware = base::SysInfo::OperatingSystemArchitecture();
-
-#if defined(OS_CHROMEOS)
-  chromeos::system::StatisticsProvider* provider =
-      chromeos::system::StatisticsProvider::GetInstance();
-
-  std::string hwclass;
-  if (!provider->GetMachineStatistic(chromeos::system::kHardwareClass,
-                                     &hwclass)) {
-    LOG(ERROR) << "Failed to get machine information";
-  }
-  os_name += ",CrOS," + base::SysInfo::GetLsbReleaseBoard();
-  os_hardware += "," + hwclass;
-#endif
-
-  std::string os_version("-");
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
-  int32 os_major_version = 0;
-  int32 os_minor_version = 0;
-  int32 os_bugfix_version = 0;
-  base::SysInfo::OperatingSystemVersionNumbers(&os_major_version,
-                                               &os_minor_version,
-                                               &os_bugfix_version);
-  os_version = base::StringPrintf("%d.%d.%d",
-                                  os_major_version,
-                                  os_minor_version,
-                                  os_bugfix_version);
-#endif
-
-  return base::StringPrintf(
-      "%s|%s|%s", os_name.c_str(), os_hardware.c_str(), os_version.c_str());
-}
-
 }  // namespace
 
 BrowserPolicyConnector::BrowserPolicyConnector()
@@ -240,8 +204,7 @@ void BrowserPolicyConnector::Init(
       new DeviceManagementService(request_context,
                                   server_url,
                                   content::GetUserAgent(GURL(server_url)),
-                                  GetUserAgentParameter(),
-                                  GetPlatformParameter()));
+                                  GetUserAgentParameter()));
   device_management_service_->ScheduleInitialization(
       kServiceInitializationStartupDelay);