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 /third_party/libaddressinput | |
| 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 'third_party/libaddressinput')
4 files changed, 4 insertions, 5 deletions
diff --git a/third_party/libaddressinput/chromium/DEPS b/third_party/libaddressinput/chromium/DEPS index b55c0fa..4f5c7cf 100644 --- a/third_party/libaddressinput/chromium/DEPS +++ b/third_party/libaddressinput/chromium/DEPS @@ -1,8 +1,7 @@ include_rules = [ '+base', - "+components/prefs", '+net', '+testing', '+third_party/icu', '+url', -] +]
\ No newline at end of file diff --git a/third_party/libaddressinput/chromium/chrome_storage_impl.cc b/third_party/libaddressinput/chromium/chrome_storage_impl.cc index 918d3f2..d85a2fd 100644 --- a/third_party/libaddressinput/chromium/chrome_storage_impl.cc +++ b/third_party/libaddressinput/chromium/chrome_storage_impl.cc @@ -7,8 +7,8 @@ #include <utility> #include "base/memory/scoped_ptr.h" +#include "base/prefs/writeable_pref_store.h" #include "base/values.h" -#include "components/prefs/writeable_pref_store.h" #include "third_party/libaddressinput/chromium/fallback_data_store.h" namespace autofill { diff --git a/third_party/libaddressinput/chromium/chrome_storage_impl.h b/third_party/libaddressinput/chromium/chrome_storage_impl.h index 6a08adc..c2eac2a 100644 --- a/third_party/libaddressinput/chromium/chrome_storage_impl.h +++ b/third_party/libaddressinput/chromium/chrome_storage_impl.h @@ -10,8 +10,8 @@ #include "base/macros.h" #include "base/memory/scoped_vector.h" +#include "base/prefs/pref_store.h" #include "base/scoped_observer.h" -#include "components/prefs/pref_store.h" #include "third_party/libaddressinput/src/cpp/include/libaddressinput/storage.h" class WriteablePrefStore; diff --git a/third_party/libaddressinput/chromium/chrome_storage_impl_unittest.cc b/third_party/libaddressinput/chromium/chrome_storage_impl_unittest.cc index 629b8ff..277bfb9 100644 --- a/third_party/libaddressinput/chromium/chrome_storage_impl_unittest.cc +++ b/third_party/libaddressinput/chromium/chrome_storage_impl_unittest.cc @@ -6,7 +6,7 @@ #include <string> -#include "components/prefs/value_map_pref_store.h" +#include "base/prefs/value_map_pref_store.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/libaddressinput/chromium/storage_test_runner.h" #include "third_party/libaddressinput/src/cpp/include/libaddressinput/callback.h" |