diff options
| author | brettw <brettw@chromium.org> | 2016-02-01 16:19:08 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-02 00:20:47 +0000 |
| commit | b1fc1b83eb6eb10a7ebaff22c76082c3f0629f36 (patch) | |
| tree | e60f5a4f77cbd196d75e1f03e5b7a8153941b4b6 /chrome/browser/extensions/error_console | |
| parent | 913701b1fa2ea8a63f095454d8147d1a3b8262af (diff) | |
| download | chromium_src-b1fc1b83eb6eb10a7ebaff22c76082c3f0629f36.zip chromium_src-b1fc1b83eb6eb10a7ebaff22c76082c3f0629f36.tar.gz chromium_src-b1fc1b83eb6eb10a7ebaff22c76082c3f0629f36.tar.bz2 | |
Update chrome for new prefs location.
This is a search-and-replace update for includes with "base/prefs" ->
"components/prefs" and the headers re-sorted in the chrome directory.
DEPS files were updated to allow the components in question to depend on
components/prefs. chrome/DEPS was updated to whitelist all components rather
than listing all the ones it uses out individually. Checkdeps is a tool to
enforce layering, and Chrome is allowed to depend on any component, so listing
each one it uses doesn't help anything.
This should be a no-op from a build perspective.
BUG=583034
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/1658793002
Cr-Commit-Position: refs/heads/master@{#372827}
Diffstat (limited to 'chrome/browser/extensions/error_console')
4 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/extensions/error_console/error_console.cc b/chrome/browser/extensions/error_console/error_console.cc index 21da015..36ad416 100644 --- a/chrome/browser/extensions/error_console/error_console.cc +++ b/chrome/browser/extensions/error_console/error_console.cc @@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/lazy_instance.h" -#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/chrome_notification_types.h" @@ -19,6 +18,7 @@ #include "chrome/common/extensions/features/feature_channel.h" #include "chrome/common/pref_names.h" #include "components/crx_file/id_util.h" +#include "components/prefs/pref_service.h" #include "components/version_info/version_info.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/extensions/error_console/error_console.h b/chrome/browser/extensions/error_console/error_console.h index 679b2c2..df2ad4f 100644 --- a/chrome/browser/extensions/error_console/error_console.h +++ b/chrome/browser/extensions/error_console/error_console.h @@ -11,10 +11,10 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "base/prefs/pref_change_registrar.h" #include "base/scoped_observer.h" #include "base/threading/thread_checker.h" #include "components/keyed_service/core/keyed_service.h" +#include "components/prefs/pref_change_registrar.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "extensions/browser/error_map.h" diff --git a/chrome/browser/extensions/error_console/error_console_browsertest.cc b/chrome/browser/extensions/error_console/error_console_browsertest.cc index 8307ced..02f4068 100644 --- a/chrome/browser/extensions/error_console/error_console_browsertest.cc +++ b/chrome/browser/extensions/error_console/error_console_browsertest.cc @@ -8,7 +8,6 @@ #include "base/files/file_path.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "base/strings/string16.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" @@ -19,6 +18,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.h" +#include "components/prefs/pref_service.h" #include "extensions/browser/extension_error.h" #include "extensions/common/constants.h" #include "extensions/common/error_utils.h" diff --git a/chrome/browser/extensions/error_console/error_console_unittest.cc b/chrome/browser/extensions/error_console/error_console_unittest.cc index f356ebd..c2ea399 100644 --- a/chrome/browser/extensions/error_console/error_console_unittest.cc +++ b/chrome/browser/extensions/error_console/error_console_unittest.cc @@ -9,12 +9,12 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "chrome/common/extensions/features/feature_channel.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" #include "components/crx_file/id_util.h" +#include "components/prefs/pref_service.h" #include "components/version_info/version_info.h" #include "content/public/test/test_browser_thread_bundle.h" #include "extensions/browser/extension_error.h" |