Index: extensions/shell/browser/shell_prefs.cc |
diff --git a/extensions/shell/browser/shell_prefs.cc b/extensions/shell/browser/shell_prefs.cc |
index fdbc6565241e9c7ffe35489dee8c88dcf0c745de..82185cfcbd6633aed65a8b24facba87211a7309d 100644 |
--- a/extensions/shell/browser/shell_prefs.cc |
+++ b/extensions/shell/browser/shell_prefs.cc |
@@ -4,13 +4,13 @@ |
#include "extensions/shell/browser/shell_prefs.h" |
-#include "base/prefs/json_pref_store.h" |
-#include "base/prefs/pref_filter.h" |
-#include "base/prefs/pref_registry_simple.h" |
-#include "base/prefs/pref_service.h" |
-#include "base/prefs/pref_service_factory.h" |
#include "build/build_config.h" |
#include "components/pref_registry/pref_registry_syncable.h" |
+#include "components/prefs/json_pref_store.h" |
+#include "components/prefs/pref_filter.h" |
+#include "components/prefs/pref_registry_simple.h" |
+#include "components/prefs/pref_service.h" |
+#include "components/prefs/pref_service_factory.h" |
#include "components/user_prefs/user_prefs.h" |
#include "content/public/browser/browser_context.h" |
#include "content/public/browser/browser_thread.h" |
@@ -53,7 +53,7 @@ scoped_ptr<PrefService> CreateLocalState(const FilePath& data_dir) { |
scoped_refptr<JsonPrefStore> pref_store = CreateAndLoadPrefStore(filepath); |
// Local state is considered "user prefs" from the factory's perspective. |
- base::PrefServiceFactory factory; |
+ PrefServiceFactory factory; |
factory.set_user_prefs(pref_store); |
// Local state preferences are not syncable. |
@@ -68,7 +68,7 @@ scoped_ptr<PrefService> CreateUserPrefService( |
FilePath filepath = browser_context->GetPath().AppendASCII("user_prefs.json"); |
scoped_refptr<JsonPrefStore> pref_store = CreateAndLoadPrefStore(filepath); |
- base::PrefServiceFactory factory; |
+ PrefServiceFactory factory; |
factory.set_user_prefs(pref_store); |
// TODO(jamescook): If we want to support prefs that are set by extensions |