6 files changed, 22 insertions, 27 deletions
diff --git a/base/prefs/DEPS b/base/prefs/DEPS
index 76b3e8d..9e0b960 100644
--- a/base/prefs/DEPS
+++ b/base/prefs/DEPS
@@ -1,5 +1,10 @@
 specific_include_rules = {
   '.*_[a-z]+test\.cc': [
+    # TODO(joi): Both of these will go away soon once we move a bunch
+    # of Prefs code from c/b/prefs to base/prefs. Their dependencies
+    # on the rest of chrome/browser are already almost completely
+    # removed.
+    "!chrome/browser/prefs/pref_registry_simple.h",
     "!chrome/test/base/testing_pref_service.h",
   ],
 }
diff --git a/base/prefs/default_pref_store.cc b/base/prefs/default_pref_store.cc
index 8e2644c..3df9ad9 100644
--- a/base/prefs/default_pref_store.cc
+++ b/base/prefs/default_pref_store.cc
@@ -25,11 +25,6 @@ void DefaultPrefStore::RemoveDefaultValue(const std::string& key) {
   prefs_.RemoveValue(key);
 }
 
-base::Value::Type DefaultPrefStore::GetType(const std::string& key) const {
-  const Value* value = NULL;
-  return GetValue(key, &value) ? value->GetType() : Value::TYPE_NULL;
-}
-
 DefaultPrefStore::const_iterator DefaultPrefStore::begin() const {
   return prefs_.begin();
 }
diff --git a/base/prefs/default_pref_store.h b/base/prefs/default_pref_store.h
index 996bf8b..89a0602 100644
--- a/base/prefs/default_pref_store.h
+++ b/base/prefs/default_pref_store.h
@@ -12,8 +12,7 @@
 #include "base/prefs/pref_value_map.h"
 #include "base/values.h"
 
-// This PrefStore keeps track of default preference values set when a
-// preference is registered with the PrefService.
+// Used within a PrefRegistry to keep track of default preference values.
 class BASE_PREFS_EXPORT DefaultPrefStore : public PrefStore {
  public:
   typedef PrefValueMap::const_iterator const_iterator;
@@ -29,10 +28,6 @@ class BASE_PREFS_EXPORT DefaultPrefStore : public PrefStore {
   // Removes the value for |key|.
   void RemoveDefaultValue(const std::string& key);
 
-  // Returns the registered type for |key| or Value::TYPE_NULL if the |key|
-  // has not been registered.
-  base::Value::Type GetType(const std::string& key) const;
-
   const_iterator begin() const;
   const_iterator end() const;
 
diff --git a/base/prefs/public/pref_change_registrar_unittest.cc b/base/prefs/public/pref_change_registrar_unittest.cc
index 185c9de..df107e7 100644
--- a/base/prefs/public/pref_change_registrar_unittest.cc
+++ b/base/prefs/public/pref_change_registrar_unittest.cc
@@ -6,6 +6,7 @@
 #include "base/bind_helpers.h"
 #include "base/prefs/pref_observer.h"
 #include "base/prefs/public/pref_change_registrar.h"
+#include "chrome/browser/prefs/pref_registry_simple.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -128,9 +129,10 @@ class ObserveSetOfPreferencesTest : public testing::Test {
  public:
   virtual void SetUp() {
     pref_service_.reset(new TestingPrefServiceSimple);
-    pref_service_->RegisterStringPref(kHomePage, "http://google.com");
-    pref_service_->RegisterBooleanPref(kHomePageIsNewTabPage, false);
-    pref_service_->RegisterStringPref(kApplicationLocale, "");
+    PrefRegistrySimple* registry = pref_service_->registry();
+    registry->RegisterStringPref(kHomePage, "http://google.com");
+    registry->RegisterBooleanPref(kHomePageIsNewTabPage, false);
+    registry->RegisterStringPref(kApplicationLocale, "");
   }
 
   PrefChangeRegistrar* CreatePrefChangeRegistrar() {
diff --git a/base/prefs/public/pref_member_unittest.cc b/base/prefs/public/pref_member_unittest.cc
index 3439c0f..fb81f39 100644
--- a/base/prefs/public/pref_member_unittest.cc
+++ b/base/prefs/public/pref_member_unittest.cc
@@ -8,6 +8,7 @@
 #include "base/message_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
+#include "chrome/browser/prefs/pref_registry_simple.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -19,12 +20,12 @@ const char kDoublePref[] = "double";
 const char kStringPref[] = "string";
 const char kStringListPref[] = "string_list";
 
-void RegisterTestPrefs(PrefServiceSimple* prefs) {
-  prefs->RegisterBooleanPref(kBoolPref, false);
-  prefs->RegisterIntegerPref(kIntPref, 0);
-  prefs->RegisterDoublePref(kDoublePref, 0.0);
-  prefs->RegisterStringPref(kStringPref, "default");
-  prefs->RegisterListPref(kStringListPref, new ListValue());
+void RegisterTestPrefs(PrefRegistrySimple* registry) {
+  registry->RegisterBooleanPref(kBoolPref, false);
+  registry->RegisterIntegerPref(kIntPref, 0);
+  registry->RegisterDoublePref(kDoublePref, 0.0);
+  registry->RegisterStringPref(kStringPref, "default");
+  registry->RegisterListPref(kStringListPref, new ListValue());
 }
 
 class GetPrefValueHelper
@@ -101,7 +102,7 @@ class PrefMemberTestClass {
 
 TEST(PrefMemberTest, BasicGetAndSet) {
   TestingPrefServiceSimple prefs;
-  RegisterTestPrefs(&prefs);
+  RegisterTestPrefs(prefs.registry());
 
   // Test bool
   BooleanPrefMember boolean;
@@ -247,7 +248,7 @@ TEST(PrefMemberTest, InvalidList) {
 TEST(PrefMemberTest, TwoPrefs) {
   // Make sure two DoublePrefMembers stay in sync.
   TestingPrefServiceSimple prefs;
-  RegisterTestPrefs(&prefs);
+  RegisterTestPrefs(prefs.registry());
 
   DoublePrefMember pref1;
   pref1.Init(kDoublePref, &prefs);
@@ -267,7 +268,7 @@ TEST(PrefMemberTest, TwoPrefs) {
 
 TEST(PrefMemberTest, Observer) {
   TestingPrefServiceSimple prefs;
-  RegisterTestPrefs(&prefs);
+  RegisterTestPrefs(prefs.registry());
 
   PrefMemberTestClass test_obj(&prefs);
   EXPECT_EQ("default", *test_obj.str_);
@@ -300,7 +301,7 @@ TEST(PrefMemberTest, NoInit) {
 TEST(PrefMemberTest, MoveToThread) {
   TestingPrefServiceSimple prefs;
   scoped_refptr<GetPrefValueHelper> helper(new GetPrefValueHelper());
-  RegisterTestPrefs(&prefs);
+  RegisterTestPrefs(prefs.registry());
   helper->Init(kBoolPref, &prefs);
 
   helper->FetchValue();
diff --git a/base/prefs/public/pref_service_base.h b/base/prefs/public/pref_service_base.h
index 3508f40..3be6a06 100644
--- a/base/prefs/public/pref_service_base.h
+++ b/base/prefs/public/pref_service_base.h
@@ -107,9 +107,6 @@ class PrefServiceBase {
   // value can be changed by the user.
   virtual bool IsUserModifiablePreference(const char* pref_name) const = 0;
 
-  // Unregisters a preference.
-  virtual void UnregisterPreference(const char* path) = 0;
-
   // Look up a preference.  Returns NULL if the preference is not
   // registered.
   virtual const Preference* FindPreference(const char* pref_name) const = 0;