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

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

 // Copyright 2014 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.
 
 #include <cstdlib>
 #include <cstring>
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "base/values.h"

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

Nit: No longer used.

 #include "chrome/browser/browser_process.h"
 #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"
 #include "chrome/test/base/testing_profile.h"
 #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"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
 
 class UnittestProfileManager : public ::ProfileManagerWithoutInit {
  public:
   explicit UnittestProfileManager(const base::FilePath& user_data_dir)
       : ::ProfileManagerWithoutInit(user_data_dir) {}
 
  protected:
   Profile* CreateProfileHelper(const base::FilePath& file_path) override {
     if (!base::PathExists(file_path)) {
       if (!base::CreateDirectory(file_path))
         return NULL;
     }
     return new TestingProfile(file_path, NULL);
   }
 };
 
-
-class UserManagerTest : public testing::Test {
+class UserManagerTest : public testing::Test, public SettingsProviderTestBase {
  protected:
   void SetUp() override {
     base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess();
     command_line.AppendSwitch(::switches::kTestType);
     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);
 
     // Register an in-memory local settings instance.
     local_state_.reset(
         new ScopedTestingLocalState(TestingBrowserProcess::GetGlobal()));
 
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     TestingBrowserProcess::GetGlobal()->SetProfileManager(
         new UnittestProfileManager(temp_dir_.path()));
 
     chromeos::DBusThreadManager::Initialize();
 
     ResetUserManager();
     WallpaperManager::Initialize();
   }
 
   void TearDown() override {
     // 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();
     TestingBrowserProcess::GetGlobal()->SetProfileManager(NULL);
 
     base::RunLoop().RunUntilIdle();
     chromeos::DBusThreadManager::Shutdown();
     WallpaperManager::Shutdown();
   }
 
@@ skipping 26 matching lines @@
     user_manager_enabler_.reset(
         new ScopedUserManagerEnabler(new ChromeUserManagerImpl));
 
     // ChromeUserManagerImpl ctor posts a task to reload policies.
     base::RunLoop().RunUntilIdle();
   }
 
   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() {
     GetChromeUserManager()->RetrieveTrustedDevicePolicies();
   }
 
  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_;
 };
 
 TEST_F(UserManagerTest, RetrieveTrustedDevicePolicies) {
   SetUserManagerEphemeralUsersEnabled(true);
   SetUserManagerOwnerEmail("");
 
   SetDeviceSettings(false, "owner@invalid.domain", false);
   RetrieveTrustedDevicePolicies();
@@ skipping 39 matching lines @@
       "user0@invalid.domain", "user0@invalid.domain", false);
   ResetUserManager();
 
   const user_manager::UserList* users =
       &user_manager::UserManager::Get()->GetUsers();
   EXPECT_EQ(1U, users->size());
   EXPECT_EQ((*users)[0]->email(), "owner@invalid.domain");
 }
 
 }  // namespace chromeos