Merge 254685 "Fixed handling of 'oem_device_requisition' VPD value."

chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.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_POLICY_DEVICE_CLOUD_POLICY_MANAGER_CHROMEOS_H_
 #define CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_CLOUD_POLICY_MANAGER_CHROMEOS_H_
 
 #include <bitset>
 #include <string>
 
@@ skipping 97 matching lines @@
   scoped_ptr<CloudPolicyClient> CreateClient();
 
   // Starts policy refreshes if |store_| indicates a managed device and the
   // necessary dependencies have been provided via Initialize().
   void StartIfManaged();
 
   // Handles completion signaled by |enrollment_handler_|.
   void EnrollmentCompleted(const EnrollmentCallback& callback,
                            EnrollmentStatus status);
 
+  // Initializes requisition settings at OOBE with values from VPD.
+  void InitalizeRequisition();
+
   // Points to the same object as the base CloudPolicyManager::store(), but with
   // actual device policy specific type.
   scoped_ptr<DeviceCloudPolicyStoreChromeOS> device_store_;
   scoped_refptr<base::SequencedTaskRunner> background_task_runner_;
   EnterpriseInstallAttributes* install_attributes_;
 
   DeviceManagementService* device_management_service_;
   scoped_ptr<CloudPolicyClient::StatusProvider> device_status_provider_;
 
   // PrefService instance to read the policy refresh rate from.
   PrefService* local_state_;
 
   // Non-null if there is an enrollment operation pending.
   scoped_ptr<EnrollmentHandlerChromeOS> enrollment_handler_;
 
   scoped_ptr<chromeos::attestation::AttestationPolicyObserver>
       attestation_policy_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceCloudPolicyManagerChromeOS);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_CLOUD_POLICY_MANAGER_CHROMEOS_H_