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

chrome/browser/chromeos/policy/extension_cache_unittest.cc

 // Copyright (c) 2015 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 <stddef.h>
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #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"
 
 namespace extensions {
 namespace {
 
 const char kTestExtensionId1[] = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
 const char kTestExtensionId2[] = "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb";
 const char kTestExtensionId3[] = "cccccccccccccccccccccccccccccccc";
 
@@ skipping 19 matching lines @@
                                           size_t size,
                                           const base::Time& timestamp) {
   const base::FilePath filename = dir.Append(
       LocalExtensionCache::ExtensionFileName(id, version, "" /* hash */));
   CreateFile(filename, size, timestamp);
   return filename;
 }
 
 }  // 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 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 {
-    // 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 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();
   base::ScopedTempDir cache_dir;
   ASSERT_TRUE(cache_dir.CreateUniqueTempDir());
   const base::FilePath cache_path = cache_dir.path();
   CreateFile(cache_path.Append(LocalExtensionCache::kCacheReadyFlagFileName), 0,
              now);
 
   // The extension cache only has enough space for two of the three extensions.
@@ skipping 17 matching lines @@
   run_loop.reset(new base::RunLoop);
   cache_impl.Shutdown(run_loop->QuitClosure());
   run_loop->Run();
 
   EXPECT_TRUE(base::PathExists(file1));
   EXPECT_TRUE(base::PathExists(file2));
   EXPECT_FALSE(base::PathExists(file3));
 }
 
 }  // namespace extensions