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 /components/google | |
| 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 'components/google')
| -rw-r--r-- | components/google/DEPS | 1 | ||||
| -rw-r--r-- | components/google/core/browser/google_url_tracker.cc | 2 | ||||
| -rw-r--r-- | components/google/core/browser/google_url_tracker_unittest.cc | 6 |
3 files changed, 4 insertions, 5 deletions
diff --git a/components/google/DEPS b/components/google/DEPS index 21c1e50..683dd04 100644 --- a/components/google/DEPS +++ b/components/google/DEPS @@ -1,5 +1,4 @@ include_rules = [ - "+components/prefs", "+components/url_formatter", "+net", ] diff --git a/components/google/core/browser/google_url_tracker.cc b/components/google/core/browser/google_url_tracker.cc index 9a21ca4..0b3e0b3 100644 --- a/components/google/core/browser/google_url_tracker.cc +++ b/components/google/core/browser/google_url_tracker.cc @@ -10,6 +10,7 @@ #include "base/command_line.h" #include "base/location.h" #include "base/macros.h" +#include "base/prefs/pref_service.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_util.h" #include "base/thread_task_runner_handle.h" @@ -18,7 +19,6 @@ #include "components/google/core/browser/google_switches.h" #include "components/google/core/browser/google_util.h" #include "components/pref_registry/pref_registry_syncable.h" -#include "components/prefs/pref_service.h" #include "net/base/load_flags.h" #include "net/url_request/url_fetcher.h" #include "net/url_request/url_request_status.h" diff --git a/components/google/core/browser/google_url_tracker_unittest.cc b/components/google/core/browser/google_url_tracker_unittest.cc index 03b34e2..e63d36d 100644 --- a/components/google/core/browser/google_url_tracker_unittest.cc +++ b/components/google/core/browser/google_url_tracker_unittest.cc @@ -9,12 +9,12 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" +#include "base/prefs/testing_pref_service.h" #include "base/thread_task_runner_handle.h" #include "components/google/core/browser/google_pref_names.h" #include "components/google/core/browser/google_url_tracker_client.h" -#include "components/prefs/pref_registry_simple.h" -#include "components/prefs/pref_service.h" -#include "components/prefs/testing_pref_service.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_fetcher.h" #include "net/url_request/url_request_test_util.h" |