diff options
| author | brettw <brettw@chromium.org> | 2016-02-03 00:22:02 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-03 08:23:19 +0000 |
| commit | 066508682fd2bcf566f83c39169df4b949ccf09a (patch) | |
| tree | d4bb15e5eac7ed880afbf380fe9786e1d7434bca /extensions/shell | |
| parent | f531e094ae328f316e7ad3a08a4ce32f5b087e6b (diff) | |
| download | chromium_src-066508682fd2bcf566f83c39169df4b949ccf09a.zip chromium_src-066508682fd2bcf566f83c39169df4b949ccf09a.tar.gz chromium_src-066508682fd2bcf566f83c39169df4b949ccf09a.tar.bz2 | |
Delete base/prefs and update callers to use components.
Deletes the forwarding headers in base/prefs.
Updates the remaining users of base/prefs includes to use components/prefs.
Sort headers in updated files.
Move PrefServiceFactory out of the base namespace. Update users.
Update all preprocessor stuff in components/prefs to change BASE_PREFS_ to
COMPONENTS_PREFS_.
Add components/prefs to DEPS file of directories where checkdeps fails after
the update.
BUG=583034
Reland of http://crrev.com/1662523004#ps40001 with fix.
TBR=estade@chromium.org
Review URL: https://codereview.chromium.org/1668463002
Cr-Commit-Position: refs/heads/master@{#373197}
Diffstat (limited to 'extensions/shell')
| -rw-r--r-- | extensions/shell/browser/shell_browser_main_parts.cc | 2 | ||||
| -rw-r--r-- | extensions/shell/browser/shell_prefs.cc | 14 | ||||
| -rw-r--r-- | extensions/shell/browser/shell_prefs_unittest.cc | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/extensions/shell/browser/shell_browser_main_parts.cc b/extensions/shell/browser/shell_browser_main_parts.cc index 55aee81..df6dc98 100644 --- a/extensions/shell/browser/shell_browser_main_parts.cc +++ b/extensions/shell/browser/shell_browser_main_parts.cc @@ -7,11 +7,11 @@ #include <string> #include "base/command_line.h" -#include "base/prefs/pref_service.h" #include "base/run_loop.h" #include "build/build_config.h" #include "components/devtools_http_handler/devtools_http_handler.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" +#include "components/prefs/pref_service.h" #include "components/storage_monitor/storage_monitor.h" #include "components/update_client/update_query_params.h" #include "content/public/browser/child_process_security_policy.h" diff --git a/extensions/shell/browser/shell_prefs.cc b/extensions/shell/browser/shell_prefs.cc index fdbc656..82185cfc 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 diff --git a/extensions/shell/browser/shell_prefs_unittest.cc b/extensions/shell/browser/shell_prefs_unittest.cc index 740c0ef..3f91f17 100644 --- a/extensions/shell/browser/shell_prefs_unittest.cc +++ b/extensions/shell/browser/shell_prefs_unittest.cc @@ -6,8 +6,8 @@ #include "base/macros.h" #include "base/path_service.h" -#include "base/prefs/pref_service.h" #include "build/build_config.h" +#include "components/prefs/pref_service.h" #include "components/user_prefs/user_prefs.h" #include "content/public/test/test_browser_context.h" #include "content/public/test/test_browser_thread_bundle.h" |