Added the AutoEnrollmentClient and unit tests for it.

chrome/browser/policy/browser_policy_connector.cc

 // Copyright (c) 2011 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/policy/browser_policy_connector.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/path_service.h"
@@ skipping 51 matching lines @@
 
 #if defined(OS_CHROMEOS)
 // MachineInfo key names.
 const char kMachineInfoSystemHwqual[] = "hardware_class";
 
 // 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, we cannot check this first,
 // since we'd get the "serial_number" value from the SMBIOS (yes, there's a name
 // clash here!), which is different from the serial number we want and not
-// actually per-device. So, we check the the legacy keys first. If we find a
+// actually per-device. So, we check the legacy keys first. If we find a
 // serial number for these, we use it, otherwise we must be on a newer device
 // that provides the correct data in "serial_number".
 const char* kMachineInfoSerialNumberKeys[] = {
   "sn",            // ZGB
   "Product_S/N",   // Alex
   "Product_SN",    // Mario
   "serial_number"  // VPD v2+ devices
 };
 #endif
 
@@ skipping 65 matching lines @@
 }
 
 void BrowserPolicyConnector::RegisterForDevicePolicy(
     const std::string& owner_email,
     const std::string& token,
     TokenType token_type) {
 #if defined(OS_CHROMEOS)
   if (device_data_store_.get()) {
     if (device_data_store_->machine_id().empty() ||
         device_data_store_->machine_model().empty()) {
-      std::string machine_id;
-      std::string machine_model;
       chromeos::system::StatisticsProvider* provider =
           chromeos::system::StatisticsProvider::GetInstance();
+
+      std::string machine_model;
       if (!provider->GetMachineStatistic(kMachineInfoSystemHwqual,
                                          &machine_model)) {
         LOG(ERROR) << "Failed to get machine model.";
       }
-      for (size_t i = 0; i < arraysize(kMachineInfoSerialNumberKeys); i++) {
-        if (provider->GetMachineStatistic(kMachineInfoSerialNumberKeys[i],
-                                          &machine_id) &&
-            !machine_id.empty()) {
-          break;
-        }
-      }
 
+      std::string machine_id = GetSerialNumber();
       if (machine_id.empty())
         LOG(ERROR) << "Failed to get machine serial number.";
 
       device_data_store_->set_machine_id(machine_id);
       device_data_store_->set_machine_model(machine_model);
     }
     device_data_store_->set_user_name(owner_email);
     switch (token_type) {
       case TOKEN_TYPE_OAUTH:
         device_data_store_->SetOAuthToken(token);
@@ skipping 19 matching lines @@
 EnterpriseInstallAttributes::LockResult
     BrowserPolicyConnector::LockDevice(const std::string& user) {
 #if defined(OS_CHROMEOS)
   if (install_attributes_.get())
     return install_attributes_->LockDevice(user);
 #endif
 
   return EnterpriseInstallAttributes::LOCK_BACKEND_ERROR;
 }
 
+// static
+std::string BrowserPolicyConnector::GetSerialNumber() {
+  std::string serial_number;
+#if defined(OS_CHROMEOS)
+  chromeos::system::StatisticsProvider* provider =
+      chromeos::system::StatisticsProvider::GetInstance();
+  for (size_t i = 0; i < arraysize(kMachineInfoSerialNumberKeys); i++) {
+    if (provider->GetMachineStatistic(kMachineInfoSerialNumberKeys[i],
+                                      &serial_number) &&
+        !serial_number.empty()) {
+      break;
+    }
+  }
+#endif
+  return serial_number;
+}
+
 std::string BrowserPolicyConnector::GetEnterpriseDomain() {
 #if defined(OS_CHROMEOS)
   if (install_attributes_.get())
     return install_attributes_->GetDomain();
 #endif
 
   return std::string();
 }
 
 void BrowserPolicyConnector::ResetDevicePolicy() {
@@ skipping 257 matching lines @@
         config_dir_path.Append(FILE_PATH_LITERAL("recommended")));
   } else {
     return NULL;
   }
 #else
   return NULL;
 #endif
 }
 
 }  // namespace policy