Switch to direct use of OwnerSettingsServiceChromeOS::Set() in tests.

chrome/browser/chromeos/login/users/user_manager_unittest.cc

Index: chrome/browser/chromeos/login/users/user_manager_unittest.cc
diff --git a/chrome/browser/chromeos/login/users/user_manager_unittest.cc b/chrome/browser/chromeos/login/users/user_manager_unittest.cc
index 3765efa4651b545664701ac8c717fd3691647004..9d3f5aa0c908720a0d2f2688951c27fd89a46fb2 100644
--- a/chrome/browser/chromeos/login/users/user_manager_unittest.cc
+++ b/chrome/browser/chromeos/login/users/user_manager_unittest.cc
@@ -16,9 +16,7 @@
 #include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
-#include "chrome/browser/chromeos/settings/cros_settings.h"
-#include "chrome/browser/chromeos/settings/device_settings_service.h"
-#include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"

[bartfab (slow), 2015/03/31 14:12:40]

Nit: Still used in line 128 and others.

+#include "chrome/browser/chromeos/settings/settings_provider_test_base.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/test/base/scoped_testing_local_state.h"
 #include "chrome/test/base/testing_browser_process.h"
@@ -26,7 +24,6 @@
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/settings/cros_settings_names.h"
-#include "chromeos/settings/cros_settings_provider.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/common/content_switches.h"
@@ -50,8 +47,7 @@ class UnittestProfileManager : public ::ProfileManagerWithoutInit {
   }
 };
 
-
-class UserManagerTest : public testing::Test {
+class UserManagerTest : public testing::Test, public SettingsProviderTestBase {
  protected:
   void SetUp() override {
     base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess();
@@ -59,15 +55,7 @@ class UserManagerTest : public testing::Test {
     command_line.AppendSwitch(
         chromeos::switches::kIgnoreUserProfileMappingForTests);
 
-    cros_settings_ = CrosSettings::Get();
-
-    // Replace the real DeviceSettingsProvider with a stub.
-    device_settings_provider_ =
-        cros_settings_->GetProvider(chromeos::kReportDeviceVersionInfo);
-    EXPECT_TRUE(device_settings_provider_);
-    EXPECT_TRUE(
-        cros_settings_->RemoveSettingsProvider(device_settings_provider_));
-    cros_settings_->AddSettingsProvider(&stub_settings_provider_);
+    ReplaceProvider(kDeviceOwner);
 
     // Populate the stub DeviceSettingsProvider with valid values.
     SetDeviceSettings(false, "", false);
@@ -90,10 +78,7 @@ class UserManagerTest : public testing::Test {
     // Unregister the in-memory local settings instance.
     local_state_.reset();
 
-    // Restore the real DeviceSettingsProvider.
-    EXPECT_TRUE(
-      cros_settings_->RemoveSettingsProvider(&stub_settings_provider_));
-    cros_settings_->AddSettingsProvider(device_settings_provider_);
+    RestoreProvider();
 
     // Shut down the DeviceSettingsService.
     DeviceSettingsService::Get()->UnsetSessionManager();
@@ -140,14 +125,11 @@ class UserManagerTest : public testing::Test {
   void SetDeviceSettings(bool ephemeral_users_enabled,
                          const std::string &owner,
                          bool supervised_users_enabled) {
-    base::FundamentalValue
-        ephemeral_users_enabled_value(ephemeral_users_enabled);
-    stub_settings_provider_.Set(kAccountsPrefEphemeralUsersEnabled,
-        ephemeral_users_enabled_value);
-    base::StringValue owner_value(owner);
-    stub_settings_provider_.Set(kDeviceOwner, owner_value);
-    stub_settings_provider_.Set(kAccountsPrefSupervisedUsersEnabled,
-        base::FundamentalValue(supervised_users_enabled));
+    stub_settings_provider_.SetBoolean(kAccountsPrefEphemeralUsersEnabled,
+                                       ephemeral_users_enabled);
+    stub_settings_provider_.SetString(kDeviceOwner, owner);
+    stub_settings_provider_.SetBoolean(kAccountsPrefSupervisedUsersEnabled,
+                                       supervised_users_enabled);
   }
 
   void RetrieveTrustedDevicePolicies() {
@@ -157,14 +139,8 @@ class UserManagerTest : public testing::Test {
  protected:
   content::TestBrowserThreadBundle thread_bundle_;
 
-  CrosSettings* cros_settings_;
-  CrosSettingsProvider* device_settings_provider_;
-  StubCrosSettingsProvider stub_settings_provider_;
   scoped_ptr<ScopedTestingLocalState> local_state_;
 
-  ScopedTestDeviceSettingsService test_device_settings_service_;
-  ScopedTestCrosSettings test_cros_settings_;
-
   scoped_ptr<ScopedUserManagerEnabler> user_manager_enabler_;
   base::ScopedTempDir temp_dir_;
 };