From b1fc1b83eb6eb10a7ebaff22c76082c3f0629f36 Mon Sep 17 00:00:00 2001
From: brettw <brettw@chromium.org>
Date: Mon, 1 Feb 2016 16:19:08 -0800
Subject: 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}
---
chrome/browser/ssl/bad_clock_blocking_page.cc | 2 +-
chrome/browser/ssl/captive_portal_blocking_page.cc | 2 +-
chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc | 2 +-
chrome/browser/ssl/cert_report_helper.cc | 2 +-
chrome/browser/ssl/certificate_reporting_test_utils.cc | 2 +-
chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc | 2 +-
chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h | 2 +-
chrome/browser/ssl/ssl_blocking_page.cc | 2 +-
chrome/browser/ssl/ssl_browser_tests.cc | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
(limited to 'chrome/browser/ssl')
diff --git a/chrome/browser/ssl/bad_clock_blocking_page.cc b/chrome/browser/ssl/bad_clock_blocking_page.cc
index 280bf32..2e40a35 100644
--- a/chrome/browser/ssl/bad_clock_blocking_page.cc
+++ b/chrome/browser/ssl/bad_clock_blocking_page.cc
@@ -7,7 +7,6 @@
#include <utility>
#include "base/callback_helpers.h"
-#include "base/prefs/pref_service.h"
#include "base/strings/string_number_conversions.h"
#include "chrome/browser/interstitials/chrome_controller_client.h"
#include "chrome/browser/interstitials/chrome_metrics_helper.h"
@@ -16,6 +15,7 @@
#include "chrome/browser/ssl/cert_report_helper.h"
#include "chrome/browser/ssl/ssl_cert_reporter.h"
#include "chrome/common/pref_names.h"
+#include "components/prefs/pref_service.h"
#include "components/security_interstitials/core/bad_clock_ui.h"
#include "components/security_interstitials/core/controller_client.h"
#include "components/security_interstitials/core/metrics_helper.h"
diff --git a/chrome/browser/ssl/captive_portal_blocking_page.cc b/chrome/browser/ssl/captive_portal_blocking_page.cc
index 3122552..753057f 100644
--- a/chrome/browser/ssl/captive_portal_blocking_page.cc
+++ b/chrome/browser/ssl/captive_portal_blocking_page.cc
@@ -8,7 +8,6 @@
#include "base/i18n/rtl.h"
#include "base/metrics/histogram.h"
-#include "base/prefs/pref_service.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -21,6 +20,7 @@
#include "chrome/common/pref_names.h"
#include "components/captive_portal/captive_portal_detector.h"
#include "components/certificate_reporting/error_reporter.h"
+#include "components/prefs/pref_service.h"
#include "components/security_interstitials/core/controller_client.h"
#include "components/url_formatter/url_formatter.h"
#include "components/wifi/wifi_service.h"
diff --git a/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc b/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc
index 1cef608..e913d42 100644
--- a/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc
+++ b/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc
@@ -10,7 +10,6 @@
#include "base/callback.h"
#include "base/logging.h"
#include "base/macros.h"
-#include "base/prefs/pref_service.h"
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
#include "chrome/browser/interstitials/security_interstitial_page_test_utils.h"
@@ -23,6 +22,7 @@
#include "chrome/common/pref_names.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "components/captive_portal/captive_portal_detector.h"
+#include "components/prefs/pref_service.h"
#include "content/public/browser/interstitial_page.h"
#include "content/public/browser/web_contents.h"
#include "content/public/test/browser_test_utils.h"
diff --git a/chrome/browser/ssl/cert_report_helper.cc b/chrome/browser/ssl/cert_report_helper.cc
index 287fb51..87f3c7b 100644
--- a/chrome/browser/ssl/cert_report_helper.cc
+++ b/chrome/browser/ssl/cert_report_helper.cc
@@ -8,7 +8,6 @@
#include "base/logging.h"
#include "base/metrics/field_trial.h"
-#include "base/prefs/pref_service.h"
#include "base/rand_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
@@ -18,6 +17,7 @@
#include "chrome/browser/ssl/ssl_cert_reporter.h"
#include "chrome/common/pref_names.h"
#include "chrome/grit/generated_resources.h"
+#include "components/prefs/pref_service.h"
#include "components/security_interstitials/core/controller_client.h"
#include "components/security_interstitials/core/metrics_helper.h"
#include "components/variations/variations_associated_data.h"
diff --git a/chrome/browser/ssl/certificate_reporting_test_utils.cc b/chrome/browser/ssl/certificate_reporting_test_utils.cc
index 2a244e3..5e7c378 100644
--- a/chrome/browser/ssl/certificate_reporting_test_utils.cc
+++ b/chrome/browser/ssl/certificate_reporting_test_utils.cc
@@ -10,7 +10,6 @@
#include "base/bind_helpers.h"
#include "base/macros.h"
#include "base/metrics/field_trial.h"
-#include "base/prefs/pref_service.h"
#include "base/run_loop.h"
#include "base/strings/string_number_conversions.h"
#include "chrome/browser/browser_process.h"
@@ -24,6 +23,7 @@
#include "chrome/common/pref_names.h"
#include "components/certificate_reporting/error_report.h"
#include "components/certificate_reporting/error_reporter.h"
+#include "components/prefs/pref_service.h"
#include "components/variations/variations_associated_data.h"
#include "net/url_request/certificate_report_sender.h"
#include "net/url_request/url_request_context.h"
diff --git a/chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc b/chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc
index 6ac4d09..fc46b36 100644
--- a/chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc
+++ b/chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc
@@ -7,7 +7,6 @@
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/macros.h"
-#include "base/prefs/pref_service.h"
#include "base/strings/string_split.h"
#include "chrome/browser/ssl/cert_verifier_browser_test.h"
#include "chrome/browser/ssl/chrome_security_state_model_client.h"
@@ -19,6 +18,7 @@
#include "chrome/common/pref_names.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
+#include "components/prefs/pref_service.h"
#include "content/public/browser/cert_store.h"
#include "content/public/browser/interstitial_page.h"
#include "content/public/browser/navigation_controller.h"
diff --git a/chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h b/chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h
index a638dd5..fe7549e 100644
--- a/chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h
+++ b/chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h
@@ -7,9 +7,9 @@
#include "base/macros.h"
#include "base/memory/singleton.h"
-#include "base/prefs/pref_service.h"
#include "base/values.h"
#include "components/keyed_service/content/browser_context_keyed_service_factory.h"
+#include "components/prefs/pref_service.h"
class ChromeSSLHostStateDelegate;
class Profile;
diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc
index 4705291..4aa09fa 100644
--- a/chrome/browser/ssl/ssl_blocking_page.cc
+++ b/chrome/browser/ssl/ssl_blocking_page.cc
@@ -10,7 +10,6 @@
#include "base/bind_helpers.h"
#include "base/callback_helpers.h"
#include "base/metrics/histogram.h"
-#include "base/prefs/pref_service.h"
#include "base/strings/string_number_conversions.h"
#include "base/time/time.h"
#include "chrome/browser/browser_process.h"
@@ -22,6 +21,7 @@
#include "chrome/browser/ssl/ssl_cert_reporter.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
+#include "components/prefs/pref_service.h"
#include "components/security_interstitials/core/controller_client.h"
#include "components/security_interstitials/core/metrics_helper.h"
#include "components/security_interstitials/core/ssl_error_ui.h"
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
index 20b8c8b..8ec45cd 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -12,7 +12,6 @@
#include "base/location.h"
#include "base/macros.h"
#include "base/metrics/field_trial.h"
-#include "base/prefs/pref_service.h"
#include "base/single_thread_task_runner.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
@@ -50,6 +49,7 @@
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
#include "components/content_settings/core/browser/host_content_settings_map.h"
+#include "components/prefs/pref_service.h"
#include "components/security_interstitials/core/controller_client.h"
#include "components/security_interstitials/core/metrics_helper.h"
#include "components/security_state/security_state_model.h"
--
cgit v1.1