Add DeviceSettingProvider unit tests.

chrome/browser/chromeos/device_settings_provider.cc

Index: chrome/browser/chromeos/device_settings_provider.cc
diff --git a/chrome/browser/chromeos/device_settings_provider.cc b/chrome/browser/chromeos/device_settings_provider.cc
index 5aadaf20b125942b7b36141c34e301d00f450613..b00dc7b976a825eb9ea8959400dbd5862b32e861 100644
--- a/chrome/browser/chromeos/device_settings_provider.cc
+++ b/chrome/browser/chromeos/device_settings_provider.cc
@@ -81,12 +81,33 @@ bool HasOldMetricsFile() {
 }  // namespace
 
 DeviceSettingsProvider::DeviceSettingsProvider(
+    const NotifyObserversCallback& notify_cb,
+    SignedSettingsHelper* signed_settings_helper,
+    OwnershipService::Status ownership_status)
+    : CrosSettingsProvider(notify_cb),
+      signed_settings_helper_(signed_settings_helper),
+      ownership_status_(ownership_status),
+      migration_helper_(new SignedSettingsMigrationHelper()),
+      retries_left_(kNumRetriesLimit),
+      trusted_(false) {
+  Initialize();
+}
+
+DeviceSettingsProvider::DeviceSettingsProvider(
     const NotifyObserversCallback& notify_cb)
     : CrosSettingsProvider(notify_cb),
+      signed_settings_helper_(SignedSettingsHelper::Get()),
       ownership_status_(OwnershipService::GetSharedInstance()->GetStatus(true)),
       migration_helper_(new SignedSettingsMigrationHelper()),
       retries_left_(kNumRetriesLimit),
       trusted_(false) {
+  Initialize();
+}
+
+DeviceSettingsProvider::~DeviceSettingsProvider() {
+}
+
+void DeviceSettingsProvider::Initialize() {
   // Register for notification when ownership is taken so that we can update
   // the |ownership_status_| and reload if needed.
   registrar_.Add(this, chrome::NOTIFICATION_OWNER_KEY_FETCH_ATTEMPT_SUCCEEDED,
@@ -97,9 +118,6 @@ DeviceSettingsProvider::DeviceSettingsProvider(
   Reload();
 }
 
-DeviceSettingsProvider::~DeviceSettingsProvider() {
-}
-
 void DeviceSettingsProvider::Reload() {
   // While fetching we can't trust the cache anymore.
   trusted_ = false;
@@ -107,7 +125,7 @@ void DeviceSettingsProvider::Reload() {
     RetrieveCachedData();
   } else {
     // Retrieve the real data.
-    SignedSettingsHelper::Get()->StartRetrievePolicyOp(
+    signed_settings_helper_->StartRetrievePolicyOp(
         base::Bind(&DeviceSettingsProvider::OnRetrievePolicyCompleted,
                    base::Unretained(this)));
   }
@@ -194,7 +212,7 @@ void DeviceSettingsProvider::SetInPolicy() {
 
   if (!RequestTrustedEntity()) {
     // Otherwise we should first reload and apply on top of that.
-    SignedSettingsHelper::Get()->StartRetrievePolicyOp(
+    signed_settings_helper_->StartRetrievePolicyOp(
         base::Bind(&DeviceSettingsProvider::FinishSetInPolicy,
                    base::Unretained(this)));
     return;
@@ -303,7 +321,7 @@ void DeviceSettingsProvider::SetInPolicy() {
   if (ownership_status_ == OwnershipService::OWNERSHIP_TAKEN) {
     em::PolicyFetchResponse policy_envelope;
     policy_envelope.set_policy_data(policy_.SerializeAsString());
-    SignedSettingsHelper::Get()->StartStorePolicyOp(
+    signed_settings_helper_->StartStorePolicyOp(
         policy_envelope,
         base::Bind(&DeviceSettingsProvider::OnStorePolicyCompleted,
                    base::Unretained(this)));