Move creation of the PrefStores into the PrefValueStore, to reduce the knowledge the PrefService has of its two-levels-deep implementation.

Create a TestingPrefService::TestingPrefValueStore to allow tests to set the PrefStores directly, as they used to be able to do.

BUG=50722
TEST=covered by unit tests
Review URL: http://codereview.chromium.org/3032058

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55202 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 6 deletions

diff --git a/chrome/browser/pref_value_store_unittest.cc b/chrome/browser/pref_value_store_unittest.cc
index ae14598..55982d9 100644
--- a/chrome/browser/pref_value_store_unittest.cc
+++ b/chrome/browser/pref_value_store_unittest.cc
@@ -6,8 +6,10 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/configuration_policy_pref_store.h"
+#include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/dummy_pref_store.h"
 #include "chrome/browser/pref_value_store.h"
+#include "chrome/test/testing_pref_service.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -85,11 +87,12 @@ class PrefValueStoreTest : public testing::Test {
     recommended_pref_store_->set_prefs(recommended_prefs_);
 
     // Create a new pref-value-store.
-    pref_value_store_ = new PrefValueStore(enforced_pref_store_,
-                                           extension_pref_store_,
-                                           command_line_pref_store_,
-                                           user_pref_store_,
-                                           recommended_pref_store_);
+    pref_value_store_ = new TestingPrefService::TestingPrefValueStore(
+        enforced_pref_store_,
+        extension_pref_store_,
+        command_line_pref_store_,
+        user_pref_store_,
+        recommended_pref_store_);
 
     ui_thread_.reset(new ChromeThread(ChromeThread::UI, &loop_));
     file_thread_.reset(new ChromeThread(ChromeThread::FILE, &loop_));
@@ -176,7 +179,7 @@ class PrefValueStoreTest : public testing::Test {
 
   MessageLoop loop_;
 
-  scoped_refptr<PrefValueStore> pref_value_store_;
+  scoped_refptr<TestingPrefService::TestingPrefValueStore> pref_value_store_;
 
   // |PrefStore|s are owned by the |PrefValueStore|.
   DummyPrefStore* enforced_pref_store_;