Move device requisition to EnterpriseEnrollmentHandlerChromeOS.

chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h

Index: chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h
index 5cb0be5f3dce9a1894a1e60c1a9b5a42d31aa912..ab1176c2577cc438c94add48c04038022d163cee 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h
@@ -26,7 +26,6 @@ class AttestationPolicyObserver;
 }
 }
 
-class PrefRegistrySimple;
 class PrefService;
 
 namespace policy {
@@ -43,23 +42,9 @@ class DeviceCloudPolicyManagerChromeOS : public CloudPolicyManager {
       ServerBackedStateKeysBroker* state_keys_broker);
   virtual ~DeviceCloudPolicyManagerChromeOS();
 
-  // Initializes state keys and requisition information.
-  void Initialize(PrefService* local_state);
-
-  // TODO(davidyu): Move these two functions to a more appropriate place. See
-  // http://crbug.com/383695.
-  // Gets/Sets the device requisition.
-  std::string GetDeviceRequisition() const;
-  void SetDeviceRequisition(const std::string& requisition);
-  bool IsRemoraRequisition() const;
-  bool IsSharkRequisition() const;
-
   // CloudPolicyManager:
   virtual void Shutdown() OVERRIDE;
 
-  // Pref registration helper.
-  static void RegisterPrefs(PrefRegistrySimple* registry);
-
   // Returns the device serial number, or an empty string if not available.
   static std::string GetMachineID();
 
@@ -74,7 +59,8 @@ class DeviceCloudPolicyManagerChromeOS : public CloudPolicyManager {
   // Starts the connection via |client_to_connect|.
   void StartConnection(scoped_ptr<CloudPolicyClient> client_to_connect,
                        scoped_ptr<CloudPolicyClient::StatusProvider>
-                           device_status_provider);
+                           device_status_provider,
+                       PrefService* local_state);
 
   DeviceCloudPolicyStoreChromeOS* device_store() {
     return device_store_.get();
@@ -84,9 +70,6 @@ class DeviceCloudPolicyManagerChromeOS : public CloudPolicyManager {
   // Saves the state keys received from |session_manager_client_|.
   void OnStateKeysUpdated();
 
-  // Initializes requisition settings at OOBE with values from VPD.
-  void InitializeRequisition();
-
   // Points to the same object as the base CloudPolicyManager::store(), but with
   // actual device policy specific type.
   scoped_ptr<DeviceCloudPolicyStoreChromeOS> device_store_;
@@ -94,9 +77,6 @@ class DeviceCloudPolicyManagerChromeOS : public CloudPolicyManager {
 
   ServerBackedStateKeysBroker::Subscription state_keys_update_subscription_;
 
-  // PrefService instance to read the policy refresh rate from.
-  PrefService* local_state_;
-
   scoped_ptr<chromeos::attestation::AttestationPolicyObserver>
       attestation_policy_observer_;