Connect enrollment screen to cloud policy subsystem.

chrome/browser/policy/device_policy_identity_strategy.cc

Index: chrome/browser/policy/device_policy_identity_strategy.cc
diff --git a/chrome/browser/policy/device_policy_identity_strategy.cc b/chrome/browser/policy/device_policy_identity_strategy.cc
index 010ca909933e176468f30efa492d9903785653dd..99c2419ab3922c8e80265e2b792c450412830722 100644
--- a/chrome/browser/policy/device_policy_identity_strategy.cc
+++ b/chrome/browser/policy/device_policy_identity_strategy.cc
@@ -5,6 +5,8 @@
 #include "chrome/browser/policy/device_policy_identity_strategy.h"
 
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/cros/system_library.h"
 #include "chrome/browser/chromeos/login/ownership_service.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/net/gaia/token_service.h"
@@ -16,9 +18,23 @@
 #include "content/common/notification_service.h"
 #include "content/common/notification_type.h"
 
+// MachineInfo key names.
+static const char kMachineInfoSystemHwqual[] = "hardware_class";
+static const char kMachineInfoSerialNumber[] = "serial_number";
+
 namespace policy {
 
 DevicePolicyIdentityStrategy::DevicePolicyIdentityStrategy() {
+  chromeos::SystemLibrary* sys_lib =
+      chromeos::CrosLibrary::Get()->GetSystemLibrary();
+
+  if (!sys_lib->GetMachineStatistic(kMachineInfoSystemHwqual,
+                                    &machine_model_) ||
+      !sys_lib->GetMachineStatistic(kMachineInfoSerialNumber,

[Jakob Kummerow, 2011/04/12 16:42:59]

Due to lazy evaluation of conditions, if fetching the model failed, then
fetching the serial number will not even be attempted. We could put in more
effort here, but I'm not sure if it really makes a difference.

[Mattias Nissler (ping if slow), 2011/04/12 16:49:47]

Good point, no reason to not be more careful.
Done.

+                                    &machine_id_)) {
+    LOG(ERROR) << "Failed to get machine information, using dummy model "
+               << machine_model_ << " and id " << machine_id_;
+  }
 }
 
 DevicePolicyIdentityStrategy::~DevicePolicyIdentityStrategy() {
@@ -36,6 +52,10 @@ std::string DevicePolicyIdentityStrategy::GetMachineID() {
   return machine_id_;
 }
 
+std::string DevicePolicyIdentityStrategy::GetMachineModel() {
+  return machine_model_;
+}
+
 em::DeviceRegisterRequest_Type
 DevicePolicyIdentityStrategy::GetPolicyRegisterType() {
   return em::DeviceRegisterRequest::DEVICE;
@@ -47,11 +67,9 @@ std::string DevicePolicyIdentityStrategy::GetPolicyType() {
 
 void DevicePolicyIdentityStrategy::SetAuthCredentials(
     const std::string& username,
-    const std::string& auth_token,
-    const std::string& machine_id) {
+    const std::string& auth_token) {
   username_ = username;
   auth_token_ = auth_token;
-  machine_id_ = machine_id;
   device_id_ = guid::GenerateGUID();
   NotifyAuthChanged();
 }
@@ -68,10 +86,6 @@ void DevicePolicyIdentityStrategy::SetDeviceManagementCredentials(
 
 bool DevicePolicyIdentityStrategy::GetCredentials(std::string* username,
                                                   std::string* auth_token) {
-  // Need to know the machine id.
-  if (machine_id_.empty())
-    return false;
-
   *username = username_;
   *auth_token = auth_token_;