diff options
| author | brettw <brettw@chromium.org> | 2016-02-01 14:11:38 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-01 22:12:35 +0000 |
| commit | f00b9b402a67812bff2fc2372690ab561e93b416 (patch) | |
| tree | 900b483366a96c879470e6dd258a544084b43b8a /components/ssl_config | |
| parent | 2a1a66fe10ab3d4de81b891497f4d25037e09af1 (diff) | |
| download | chromium_src-f00b9b402a67812bff2fc2372690ab561e93b416.zip chromium_src-f00b9b402a67812bff2fc2372690ab561e93b416.tar.gz chromium_src-f00b9b402a67812bff2fc2372690ab561e93b416.tar.bz2 | |
Update components for new prefs location.
This is a search-and-replace update for includes with "base/prefs" ->
"components/prefs" and the headers re-sorted.
DEPS files were updated to allow the components in question to depend on
components/prefs.
This should be a no-op from a build perspective.
BUG=583034
Review URL: https://codereview.chromium.org/1651203002
Cr-Commit-Position: refs/heads/master@{#372780}
Diffstat (limited to 'components/ssl_config')
| -rw-r--r-- | components/ssl_config/DEPS | 1 | ||||
| -rw-r--r-- | components/ssl_config/ssl_config_service_manager_pref.cc | 8 | ||||
| -rw-r--r-- | components/ssl_config/ssl_config_service_manager_pref_unittest.cc | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/components/ssl_config/DEPS b/components/ssl_config/DEPS index 198af50..0fa195e 100644 --- a/components/ssl_config/DEPS +++ b/components/ssl_config/DEPS @@ -1,6 +1,7 @@ include_rules = [ "+components/content_settings/core/browser", "+components/content_settings/core/common", + "+components/prefs", "+net/socket", "+net/ssl", ] diff --git a/components/ssl_config/ssl_config_service_manager_pref.cc b/components/ssl_config/ssl_config_service_manager_pref.cc index aaa7070..8d8cf5c 100644 --- a/components/ssl_config/ssl_config_service_manager_pref.cc +++ b/components/ssl_config/ssl_config_service_manager_pref.cc @@ -12,15 +12,15 @@ #include "base/bind.h" #include "base/macros.h" #include "base/metrics/field_trial.h" -#include "base/prefs/pref_change_registrar.h" -#include "base/prefs/pref_member.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_util.h" #include "base/values.h" #include "components/content_settings/core/browser/content_settings_utils.h" #include "components/content_settings/core/common/content_settings.h" +#include "components/prefs/pref_change_registrar.h" +#include "components/prefs/pref_member.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "components/ssl_config/ssl_config_prefs.h" #include "components/ssl_config/ssl_config_switches.h" #include "net/ssl/ssl_cipher_suite_names.h" diff --git a/components/ssl_config/ssl_config_service_manager_pref_unittest.cc b/components/ssl_config/ssl_config_service_manager_pref_unittest.cc index 85cbc20..72b8818 100644 --- a/components/ssl_config/ssl_config_service_manager_pref_unittest.cc +++ b/components/ssl_config/ssl_config_service_manager_pref_unittest.cc @@ -6,9 +6,9 @@ #include "base/memory/ref_counted.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/testing_pref_service.h" #include "base/thread_task_runner_handle.h" #include "base/values.h" +#include "components/prefs/testing_pref_service.h" #include "components/ssl_config/ssl_config_prefs.h" #include "components/ssl_config/ssl_config_switches.h" #include "net/ssl/ssl_config.h" |