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

chrome/browser/chromeos/settings/device_settings_test_helper.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_
 #define CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 33 matching lines @@
   // Runs all pending retrieve callbacks.
   void FlushRetrieve();
 
   // Flushes all pending operations.
   void Flush();
 
   // Checks whether any asynchronous Store/Retrieve operations are pending.
   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(
       const std::string& id) const {
     const std::map<std::string, PolicyState>::const_iterator entry =
         device_local_account_policy_.find(id);
     return entry == device_local_account_policy_.end() ?
         EmptyString() : entry->second.policy_blob_;
   }
 
@@ skipping 41 matching lines @@
     std::vector<RetrievePolicyCallback> retrieve_callbacks_;
 
     PolicyState();
     ~PolicyState();
 
     bool HasPendingOperations() const {
       return !store_callbacks_.empty() || !retrieve_callbacks_.empty();
     }
   };
 
-  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);
 };
 
 // Wraps the singleton device settings and initializes it to the point where it
 // reports OWNERSHIP_NONE for the ownership status.
 class ScopedDeviceSettingsTestHelper : public DeviceSettingsTestHelper {
  public:
   ScopedDeviceSettingsTestHelper();
@@ skipping 34 matching lines @@
   // with the global instance (DeviceSettingsService::Get()).
   DeviceSettingsService device_settings_service_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DeviceSettingsTestBase);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_