Move creation of the PrefStores into the PrefValueStore, to reduce the knowle...

chrome/browser/extensions/extension_pref_store_unittest.cc

 // Copyright (c) 2010 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 <gtest/gtest.h>
 
 #include <string>
 #include <vector>
 
 #include "base/scoped_ptr.h"
 #include "base/scoped_temp_dir.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_pref_store.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/pref_value_store.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/test/testing_pref_service.h"
 
 namespace {
 
 class TestExtensionPrefStore : public ExtensionPrefStore {
  public:
   TestExtensionPrefStore() : ExtensionPrefStore(NULL),
                              ext1(NULL),
                              ext2(NULL),
                              ext3(NULL),
                              pref_service_(NULL) {
@@ skipping 287 matching lines @@
   EXPECT_FALSE(prefs->GetString(kPref4, &actual));
 }
 
 TEST(ExtensionPrefStoreTest, NotifyWhenNeeded) {
   TestExtensionPrefStore* eps = new TestExtensionPrefStore;
   ASSERT_TRUE(eps->ext1 != NULL);
 
   // The PrefValueStore takes ownership of the PrefStores; in this case, that's
   // only an ExtensionPrefStore. Likewise, the PrefService takes ownership of
   // the PrefValueStore.
-  PrefValueStore* value_store = new PrefValueStore(NULL, eps, NULL, NULL, NULL);
+  PrefValueStore* value_store = new TestingPrefService::TestingPrefValueStore(
+      NULL, eps, NULL, NULL, NULL);
   scoped_ptr<MockPrefService> pref_service(new MockPrefService(value_store));
   eps->SetPrefService(pref_service.get());
   pref_service->RegisterStringPref(kPref1, std::string());
 
   eps->InstallExtensionPref(eps->ext1, kPref1,
       Value::CreateStringValue("https://www.chromium.org"));
   EXPECT_TRUE(pref_service->fired_observers_);
   eps->InstallExtensionPref(eps->ext1, kPref1,
       Value::CreateStringValue("https://www.chromium.org"));
   EXPECT_FALSE(pref_service->fired_observers_);
   eps->InstallExtensionPref(eps->ext1, kPref1,
       Value::CreateStringValue("chrome://newtab"));
   EXPECT_TRUE(pref_service->fired_observers_);
 
   eps->UninstallExtension(eps->ext1);
   EXPECT_TRUE(pref_service->fired_observers_);
 }