Refactor: Inject StatisticsProvider as a dependency of DeviceCloudPolicyInitializer.

chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 43 matching lines @@
 
 // Well-known requisition types.
 const char kNoRequisition[] = "none";
 const char kRemoraRequisition[] = "remora";
 const char kSharkRequisition[] = "shark";
 const char kRialtoRequisition[] = "rialto";
 
 // Zero-touch enrollment flag values.
 const char kZeroTouchEnrollmentForced[] = "forced";
 
-// These are the machine serial number keys that we check in order until we
-// find a non-empty serial number. The VPD spec says the serial number should be
-// in the "serial_number" key for v2+ VPDs. However, legacy devices used a
-// different key to report their serial number, which we fall back to if
-// "serial_number" is not present.
-//
-// Product_S/N is still special-cased due to inconsistencies with serial
-// numbers on Lumpy devices: On these devices, serial_number is identical to
-// Product_S/N with an appended checksum. Unfortunately, the sticker on the
-// packaging doesn't include that checksum either (the sticker on the device
-// does though!). The former sticker is the source of the serial number used by
-// device management service, so we prefer Product_S/N over serial number to
-// match the server.
-const char* const kMachineInfoSerialNumberKeys[] = {
-  "Product_S/N",    // Lumpy/Alex devices
-  "serial_number",  // VPD v2+ devices
-  "Product_SN",     // Mario
-  "sn",             // old ZGB devices (more recent ones use serial_number)
-};
-
 // Fetches a machine statistic value from StatisticsProvider, returns an empty
 // string on failure.
 std::string GetMachineStatistic(const std::string& key) {
   std::string value;
   chromeos::system::StatisticsProvider* provider =
       chromeos::system::StatisticsProvider::GetInstance();
   if (!provider->GetMachineStatistic(key, &value))
     return std::string();
 
   return value;
@@ skipping 119 matching lines @@
 void DeviceCloudPolicyManagerChromeOS::RegisterPrefs(
     PrefRegistrySimple* registry) {
   registry->RegisterStringPref(prefs::kDeviceEnrollmentRequisition,
                                std::string());
   registry->RegisterBooleanPref(prefs::kDeviceEnrollmentAutoStart, false);
   registry->RegisterBooleanPref(prefs::kDeviceEnrollmentCanExit, true);
   registry->RegisterDictionaryPref(prefs::kServerBackedDeviceState);
 }
 
 // static
-std::string DeviceCloudPolicyManagerChromeOS::GetMachineID() {
-  std::string machine_id;
-  chromeos::system::StatisticsProvider* provider =
-      chromeos::system::StatisticsProvider::GetInstance();
-  for (size_t i = 0; i < arraysize(kMachineInfoSerialNumberKeys); i++) {
-    if (provider->HasMachineStatistic(kMachineInfoSerialNumberKeys[i]) &&
-        provider->GetMachineStatistic(kMachineInfoSerialNumberKeys[i],
-                                      &machine_id) &&
-        !machine_id.empty()) {
-      break;
-    }
-  }
-
-  if (machine_id.empty()) {
-    LOG(WARNING) << "Failed to get machine id. This is only an error if the "

[emaxx, 2016/09/30 16:17:59]

Was this warning message dropped from the new version intentionally?

[Thiemo Nagel, 2016/09/30 16:57:58]

Yes.  Making that possible was the origin of the whole CL, see also
https://codereview.chromium.org/2343163002/.

-                    "device has not yet been enrolled or claimed by a local "
-                    "user.";
-  }
-
-  return machine_id;
-}
-
-// static
-std::string DeviceCloudPolicyManagerChromeOS::GetMachineModel() {
-  return GetMachineStatistic(chromeos::system::kHardwareClassKey);
-}
-
-// static
 ZeroTouchEnrollmentMode
 DeviceCloudPolicyManagerChromeOS::GetZeroTouchEnrollmentMode() {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if (!command_line->HasSwitch(
           chromeos::switches::kEnterpriseEnableZeroTouchEnrollment)) {
     return ZeroTouchEnrollmentMode::DISABLED;
   }
 
   std::string value = command_line->GetSwitchValueASCII(
       chromeos::switches::kEnterpriseEnableZeroTouchEnrollment);
@@ skipping 117 matching lines @@
       client(),
       base::MakeUnique<DeviceStatusCollector>(
           local_state_, chromeos::system::StatisticsProvider::GetInstance(),
           DeviceStatusCollector::VolumeInfoFetcher(),
           DeviceStatusCollector::CPUStatisticsFetcher(),
           DeviceStatusCollector::CPUTempFetcher()),
       task_runner_));
 }
 
 }  // namespace policy