Make CrosSettings and DeviceSettingsService non Lazy instances

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 38 matching lines @@
   // |allowed_modes| specifies acceptable DEVICE_MODE_* constants for
   // enrollment.
   void StartEnrollment(const std::string& auth_token,
                        bool is_auto_enrollment,
                        const AllowedDeviceModes& allowed_modes,
                        const EnrollmentCallback& callback);
 
   // Cancels a pending enrollment operation, if any.
   void CancelEnrollment();
 
+  // CloudPolicyManager

[Mattias Nissler (ping if slow), 2013/04/16 16:09:51]

colon.

[stevenjb, 2013/04/16 16:49:43]

Done.

+  virtual void Shutdown() OVERRIDE;
+
   // CloudPolicyStore::Observer:
   virtual void OnStoreLoaded(CloudPolicyStore* store) OVERRIDE;
 
   // Returns the device serial number, or an empty string if not available.
   static std::string GetMachineID();
 
   // Returns the machine model, or an empty string if not available.
   static std::string GetMachineModel();
 
  private:
@@ skipping 21 matching lines @@
 
   // Non-null if there is an enrollment operation pending.
   scoped_ptr<EnrollmentHandlerChromeOS> enrollment_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceCloudPolicyManagerChromeOS);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_CLOUD_POLICY_MANAGER_CHROMEOS_H_