Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/prefs/pref_value_store.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_PREFS_PREF_VALUE_STORE_H_
 #define CHROME_BROWSER_PREFS_PREF_VALUE_STORE_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/prefs/pref_store.h"
 #include "base/values.h"
 
 class PrefNotifier;
+class PrefRegistry;
 class PrefStore;
 
 // The PrefValueStore manages various sources of values for Preferences
 // (e.g., configuration policies, extensions, and user settings). It returns
 // the value of a Preference from the source with the highest priority, and
 // allows setting user-defined values for preferences that are not managed.
 //
 // Unless otherwise explicitly noted, all of the methods of this class must
 // be called on the UI thread.
 class PrefValueStore {
@@ skipping 12 matching lines @@
   //
   // |pref_notifier| facilitates broadcasting preference change notifications
   // to the world.
   PrefValueStore(PrefStore* managed_prefs,
                  PrefStore* extension_prefs,
                  PrefStore* command_line_prefs,
                  PrefStore* user_prefs,
                  PrefStore* recommended_prefs,
                  PrefStore* default_prefs,
                  PrefNotifier* pref_notifier);
+  // Same except retrieves default_prefs from PrefRegistry.
+  PrefValueStore(PrefStore* managed_prefs,
+                 PrefStore* extension_prefs,
+                 PrefStore* command_line_prefs,
+                 PrefStore* user_prefs,
+                 PrefStore* recommended_prefs,
+                 PrefRegistry* pref_registry,

[Mattias Nissler (ping if slow), 2013/01/25 14:57:11]

PrefValueStore shouldn't have to know about PrefRegistry, PrefService should
just get the default pref store pointer from PrefRegistry and pass it on here.

[Jói, 2013/01/29 16:10:02]

Done.

+                 PrefNotifier* pref_notifier);
   virtual ~PrefValueStore();
 
   // Creates a clone of this PrefValueStore with PrefStores overwritten
   // by the parameters passed, if unequal NULL.
   PrefValueStore* CloneAndSpecialize(PrefStore* managed_prefs,
                                      PrefStore* extension_prefs,
                                      PrefStore* command_line_prefs,
                                      PrefStore* user_prefs,
                                      PrefStore* recommended_prefs,
                                      PrefStore* default_prefs,
@@ skipping 188 matching lines @@
   // A mapping of preference names to their registered types.
   PrefTypeMap pref_types_;
 
   // True if not all of the PrefStores were initialized successfully.
   bool initialization_failed_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefValueStore);
 };
 
 #endif  // CHROME_BROWSER_PREFS_PREF_VALUE_STORE_H_