Make sure the device recovers from policy loss in the consumer case.

chrome/browser/chromeos/device_settings_provider.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_DEVICE_SETTINGS_PROVIDER_H_
 #define CHROME_BROWSER_CHROMEOS_DEVICE_SETTINGS_PROVIDER_H_
 #pragma once
 
 #include <string>
 #include <utility>
@@ skipping 22 matching lines @@
   explicit DeviceSettingsProvider(const NotifyObserversCallback& notify_cb);
   virtual ~DeviceSettingsProvider();
 
   // CrosSettingsProvider implementation.
   virtual const base::Value* Get(const std::string& path) const OVERRIDE;
   virtual bool GetTrusted(const std::string& path,
                           const base::Closure& callback) OVERRIDE;
   virtual bool HandlesSetting(const std::string& path) const OVERRIDE;
   virtual void Reload() OVERRIDE;
 
+ protected:
+  // Constructor that does the real initialization and can also be used by tests
+  // to mock the low level servers of this class.
+  DeviceSettingsProvider(const NotifyObserversCallback& notify_cb,
+                         SignedSettingsHelper* signed_settings_helper,
+                         OwnershipService::Status ownership_service);
+
+  void set_ownership_status(OwnershipService::Status status) {
+    ownership_status_ = status;
+  }
+
  private:
+  void Initialize();
+
   // CrosSettingsProvider implementation:
   virtual void DoSet(const std::string& path,
                      const base::Value& value) OVERRIDE;
 
   // content::NotificationObserver implementation:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   const enterprise_management::PolicyData policy() const;
@@ skipping 65 matching lines @@
   void OnStorePolicyCompleted(SignedSettings::ReturnCode code);
 
   // Callback of RetrievePolicyOp for ordinary policy [re]loads.
   void OnRetrievePolicyCompleted(
       SignedSettings::ReturnCode code,
       const enterprise_management::PolicyFetchResponse& policy);
 
   // Pending callbacks that need to be invoked after settings verification.
   std::vector<base::Closure> callbacks_;
 
+  SignedSettingsHelper* signed_settings_helper_;
   OwnershipService::Status ownership_status_;
   mutable scoped_ptr<SignedSettingsMigrationHelper> migration_helper_;
 
   content::NotificationRegistrar registrar_;
 
   // In order to guard against occasional failure to fetch a property
   // we allow for some number of retries.
   int retries_left_;
 
   enterprise_management::PolicyData policy_;
   bool trusted_;
 
   PrefValueMap values_cache_;
 
   // This is a queue for set requests, because those need to be sequential.
   typedef std::pair<std::string, base::Value*> PendingQueueElement;
   std::vector<PendingQueueElement> pending_changes_;
 
+  friend class DeviceSettingsProviderTest;
+  FRIEND_TEST_ALL_PREFIXES(DeviceSettingsProviderTest,
+                           InitializationTestUnowned);
   DISALLOW_COPY_AND_ASSIGN(DeviceSettingsProvider);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_DEVICE_SETTINGS_PROVIDER_H_