Refactor: Inject StatisticsProvider as a dependency of DeviceCloudPolicyInitializer.

chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc

 // Copyright 2014 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/login/enrollment/auto_enrollment_controller.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
-#include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/server_backed_state_keys_broker.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/system/statistics_provider.h"
 #include "components/policy/core/common/cloud/device_management_service.h"
 #include "net/url_request/url_request_context_getter.h"
 
 namespace chromeos {
 
 namespace {
 
@@ skipping 28 matching lines @@
   return int_value;
 }
 
 // Determine whether the auto-enrollment check can be skipped. This is true when
 // kCheckEnrollmentKey VPD entry doesn't indicate the device as being enrolled
 // in the past. For backward compatibility with devices upgrading from an older
 // version of Chrome OS, the kActivateDateKey VPD entry should be missing too.
 // The requirement for the machine serial number to be present as well is a
 // sanity-check to ensure that the VPD has actually been read successfully.
 bool CanSkipFRE() {
+  chromeos::system::StatisticsProvider* provider =

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

nit: "chromeos::" is unnecessary.

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

Done.

+      chromeos::system::StatisticsProvider::GetInstance();
   std::string check_enrollment_value;
   bool is_enrolled =
-      system::StatisticsProvider::GetInstance()->GetMachineStatistic(
+      provider->GetMachineStatistic(
           system::kCheckEnrollmentKey, &check_enrollment_value) &&
       check_enrollment_value == "1";
-  return !system::StatisticsProvider::GetInstance()->HasMachineStatistic(
-             system::kActivateDateKey) &&
+  return !provider->GetMachineStatistic(system::kActivateDateKey, nullptr) &&
          !is_enrolled &&
-         !policy::DeviceCloudPolicyManagerChromeOS::GetMachineID().empty();
+         !provider->GetMachineID().empty();
 }
 
 }  // namespace
 
 const char AutoEnrollmentController::kForcedReEnrollmentAlways[] = "always";
 const char AutoEnrollmentController::kForcedReEnrollmentNever[] = "never";
 const char AutoEnrollmentController::kForcedReEnrollmentOfficialBuild[] =
     "official";
 
 AutoEnrollmentController::Mode AutoEnrollmentController::GetMode() {
@@ skipping 208 matching lines @@
     // open.
     LOG(ERROR) << "AutoEnrollmentClient didn't complete within time limit.";
     UpdateState(policy::AUTO_ENROLLMENT_STATE_CONNECTION_ERROR);
   }
 
   // Reset state.
   Cancel();
 }
 
 }  // namespace chromeos