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

chrome/browser/chromeos/policy/extension_cache_unittest.cc

Index: chrome/browser/chromeos/policy/extension_cache_unittest.cc
diff --git a/chrome/browser/chromeos/policy/extension_cache_unittest.cc b/chrome/browser/chromeos/policy/extension_cache_unittest.cc
index 0b88894b5d8d53a3ac9157a818bcffbdb7d0dd7d..485cacf4f92c4b50ce9b920d72565a659d071a15 100644
--- a/chrome/browser/chromeos/policy/extension_cache_unittest.cc
+++ b/chrome/browser/chromeos/policy/extension_cache_unittest.cc
@@ -10,14 +10,11 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/time/time.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 68.

+#include "chrome/browser/chromeos/settings/settings_provider_test_base.h"
 #include "chrome/browser/extensions/updater/chromeos_extension_cache_delegate.h"
 #include "chrome/browser/extensions/updater/extension_cache_impl.h"
 #include "chrome/browser/extensions/updater/local_extension_cache.h"
 #include "chromeos/settings/cros_settings_names.h"
-#include "chromeos/settings/cros_settings_provider.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -57,40 +54,19 @@ static base::FilePath CreateExtensionFile(const base::FilePath& dir,
 
 }  // namespace
 
-class ExtensionCacheTest : public testing::Test {
+class ExtensionCacheTest : public testing::Test,
+                           public chromeos::SettingsProviderTestBase {
  public:
-  void SetUp() override {
-    // Swap out the DeviceSettingsProvider with our stub settings provider
-    // so we can set values for maximum extension cache size.
-    chromeos::CrosSettings* const cros_settings = chromeos::CrosSettings::Get();
-    device_settings_provider_ =
-        cros_settings->GetProvider(chromeos::kExtensionCacheSize);
-    EXPECT_TRUE(device_settings_provider_);
-    EXPECT_TRUE(
-        cros_settings->RemoveSettingsProvider(device_settings_provider_));
-    cros_settings->AddSettingsProvider(&stub_settings_provider_);
-  }
-
-  void TearDown() override {
-    // Restore the real DeviceSettingsProvider.
-    chromeos::CrosSettings* const cros_settings = chromeos::CrosSettings::Get();
-    EXPECT_TRUE(
-        cros_settings->RemoveSettingsProvider(&stub_settings_provider_));
-    cros_settings->AddSettingsProvider(device_settings_provider_);
-  }
-
-  // Helpers used to mock out cros settings.
-  chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
-  chromeos::ScopedTestCrosSettings test_cros_settings_;
-  chromeos::CrosSettingsProvider* device_settings_provider_ = nullptr;
-  chromeos::StubCrosSettingsProvider stub_settings_provider_;
+  void SetUp() override { ReplaceProvider(chromeos::kExtensionCacheSize); }

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

Nit: Per style guide, this must be broken into three lines.

+
+  void TearDown() override { RestoreProvider(); }

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

Nit: Per style guide, this must be broken into three lines.

 
   content::TestBrowserThreadBundle thread_bundle_;
 };
 
 TEST_F(ExtensionCacheTest, SizePolicy) {
-  chromeos::CrosSettings::Get()->SetInteger(chromeos::kExtensionCacheSize,
-                                            kMaxCacheSize);
+  stub_settings_provider_.SetInteger(chromeos::kExtensionCacheSize,
+                                     kMaxCacheSize);
 
   // Create and initialize local cache.
   const base::Time now = base::Time::Now();