Public Sessions: fetch device robot api token during enterprise enrollment.

chrome/browser/chromeos/settings/device_settings_test_helper.h

Index: chrome/browser/chromeos/settings/device_settings_test_helper.h
diff --git a/chrome/browser/chromeos/settings/device_settings_test_helper.h b/chrome/browser/chromeos/settings/device_settings_test_helper.h
index d689947725deb29193d852905f791e8714f97d7f..92ce7ccacd7631f621743dd7cb901c6213677def 100644
--- a/chrome/browser/chromeos/settings/device_settings_test_helper.h
+++ b/chrome/browser/chromeos/settings/device_settings_test_helper.h
@@ -51,17 +51,17 @@ class DeviceSettingsTestHelper : public SessionManagerClient {
   bool HasPendingOperations() const;
 
   bool store_result() {
-    return device_policy_.store_result_;
+    return policy_state_.store_result_;
   }
   void set_store_result(bool store_result) {
-    device_policy_.store_result_ = store_result;
+    policy_state_.store_result_ = store_result;
   }
 
   const std::string& policy_blob() {
-    return device_policy_.policy_blob_;
+    return policy_state_.policy_blob_;
   }
   void set_policy_blob(const std::string& policy_blob) {
-    device_policy_.policy_blob_ = policy_blob;
+    policy_state_.policy_blob_ = policy_blob;
   }
 
   const std::string& device_local_account_policy_blob(
@@ -123,7 +123,7 @@ class DeviceSettingsTestHelper : public SessionManagerClient {
     }
   };
 
-  PolicyState device_policy_;
+  PolicyState policy_state_;

[Mattias Nissler (ping if slow), 2013/04/22 10:59:00]

I see where you're coming from, but if you feel strong to rename this, then
please do add a qualifier to indicate this is device policy (as opposed to
device-local account policy below).

[David Roche, 2013/04/23 01:36:08]

I was actually confused by the fact that there was another device_policy_ in
DeviceSettingsTestBase below, that was of a different type.  Perhaps a better
thing to do is just to rename that other variable to device_policy_builder_ and
leave this as-is, so it remains consistent with the method names that manipulate
it, etc.  I won't do that in this CL though, since the device_policy_ member
below is used in ~100 places in 6 files, so it would really clutter up this CL
with confusing, unrelated diffs.

   std::map<std::string, PolicyState> device_local_account_policy_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceSettingsTestHelper);