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/browser/app_window | |
| 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/browser/app_window')
| -rw-r--r-- | extensions/browser/app_window/app_window.cc | 2 | ||||
| -rw-r--r-- | extensions/browser/app_window/app_window_geometry_cache_unittest.cc | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/extensions/browser/app_window/app_window.cc b/extensions/browser/app_window/app_window.cc index 11a3dc7..e328ecf 100644 --- a/extensions/browser/app_window/app_window.cc +++ b/extensions/browser/app_window/app_window.cc @@ -57,7 +57,7 @@ #include "ui/gfx/screen.h" #if !defined(OS_MACOSX) -#include "base/prefs/pref_service.h" +#include "components/prefs/pref_service.h" #include "extensions/browser/pref_names.h" #endif diff --git a/extensions/browser/app_window/app_window_geometry_cache_unittest.cc b/extensions/browser/app_window/app_window_geometry_cache_unittest.cc index edf1467..491f614 100644 --- a/extensions/browser/app_window/app_window_geometry_cache_unittest.cc +++ b/extensions/browser/app_window/app_window_geometry_cache_unittest.cc @@ -10,11 +10,11 @@ #include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/mock_pref_change_callback.h" -#include "base/prefs/pref_service_factory.h" -#include "base/prefs/testing_pref_store.h" #include "base/strings/string_number_conversions.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/mock_pref_change_callback.h" +#include "components/prefs/pref_service_factory.h" +#include "components/prefs/testing_pref_store.h" #include "content/public/test/test_browser_context.h" #include "content/public/test/test_browser_thread.h" #include "content/public/test/test_utils.h" @@ -85,7 +85,7 @@ void AppWindowGeometryCacheTest::SetUp() { // Set up all the dependencies of ExtensionPrefs. extension_pref_value_map_.reset(new ExtensionPrefValueMap); - base::PrefServiceFactory factory; + PrefServiceFactory factory; factory.set_user_prefs(new TestingPrefStore); factory.set_extension_prefs(new TestingPrefStore); user_prefs::PrefRegistrySyncable* pref_registry = |