diff options
| author | msw <msw@chromium.org> | 2016-02-02 17:25:06 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-03 01:26:34 +0000 |
| commit | 456d842422a8cf9954ebeab7615059a0129812de (patch) | |
| tree | 66113703585a40588dcb52d8bbf779805b8f3788 /extensions/browser/app_window | |
| parent | 91375c125e08b6b53bb7c7e3eaedab1ef7c08a0b (diff) | |
| download | chromium_src-456d842422a8cf9954ebeab7615059a0129812de.zip chromium_src-456d842422a8cf9954ebeab7615059a0129812de.tar.gz chromium_src-456d842422a8cf9954ebeab7615059a0129812de.tar.bz2 | |
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}
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 e328ecf..11a3dc7 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 "components/prefs/pref_service.h" +#include "base/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 491f614..edf1467 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); - PrefServiceFactory factory; + base::PrefServiceFactory factory; factory.set_user_prefs(new TestingPrefStore); factory.set_extension_prefs(new TestingPrefStore); user_prefs::PrefRegistrySyncable* pref_registry = |