From 456d842422a8cf9954ebeab7615059a0129812de Mon Sep 17 00:00:00 2001 From: msw Date: Tue, 2 Feb 2016 17:25:06 -0800 Subject: Revert of Delete base/prefs and update callers to use components. (patchset #3 id:40001 of https://codereview.chromium.org/1662523004/ ) Reason for revert: Broke Win Builder compile: https://build.chromium.org/p/chromium.win/builders/Win%20Builder/builds/19463/steps/compile/logs/stdio Original issue's description: > 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 > > Committed: https://crrev.com/1f5feb7e317e3c257090858e950273b64a2e31ef > Cr-Commit-Position: refs/heads/master@{#373105} TBR=estade@chromium.org,brettw@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=583034 Review URL: https://codereview.chromium.org/1662843002 Cr-Commit-Position: refs/heads/master@{#373115} --- extensions/shell/browser/shell_browser_main_parts.cc | 2 +- extensions/shell/browser/shell_prefs.cc | 14 +++++++------- extensions/shell/browser/shell_prefs_unittest.cc | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'extensions/shell') diff --git a/extensions/shell/browser/shell_browser_main_parts.cc b/extensions/shell/browser/shell_browser_main_parts.cc index df6dc98..55aee81 100644 --- a/extensions/shell/browser/shell_browser_main_parts.cc +++ b/extensions/shell/browser/shell_browser_main_parts.cc @@ -7,11 +7,11 @@ #include #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 82185cfc..fdbc656 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 CreateLocalState(const FilePath& data_dir) { scoped_refptr pref_store = CreateAndLoadPrefStore(filepath); // Local state is considered "user prefs" from the factory's perspective. - PrefServiceFactory factory; + base::PrefServiceFactory factory; factory.set_user_prefs(pref_store); // Local state preferences are not syncable. @@ -68,7 +68,7 @@ scoped_ptr CreateUserPrefService( FilePath filepath = browser_context->GetPath().AppendASCII("user_prefs.json"); scoped_refptr pref_store = CreateAndLoadPrefStore(filepath); - PrefServiceFactory factory; + base::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 3f91f17..740c0ef 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" -- cgit v1.1