Move SSLConfigServiceManager out of //components
SSLConfigServiceManager was moved into //components/ssl_config to
support iOS, but the only configuration is based on LocalState prefs,
which are neither set nor glued up to any device management policies.
This can all be uplifted back into //chrome.
On the //chrome side, the switches and prefs are unified back into the
general //chrome switches and prefs files, rather than being dedicated.
On the //ios side, all of the Profile-specific SSLConfig is removed, and
instead a default SSLConfig is used.
BUG=831193
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: I64908cdd17612ad2938f6bf0a3a5477dcec13122
Reviewed-on: https://chromium-review.googlesource.com/1004919
Reviewed-by: Rohit Rao <[email protected]>
Reviewed-by: Scott Violet <[email protected]>
Reviewed-by: Matt Menke <[email protected]>
Commit-Queue: Ryan Sleevi <[email protected]>
Cr-Commit-Position: refs/heads/master@{#551063}diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 9155def..a31ab59 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -52,6 +52,7 @@
#include "chrome/browser/rlz/chrome_rlz_tracker_delegate.h"
#include "chrome/browser/search/search.h"
#include "chrome/browser/signin/signin_manager_factory.h"
+#include "chrome/browser/ssl/ssl_config_service_manager.h"
#include "chrome/browser/task_manager/task_manager_interface.h"
#include "chrome/browser/tracing/chrome_tracing_delegate.h"
#include "chrome/browser/ui/blocked_content/safe_browsing_triggered_popup_blocker.h"
@@ -100,7 +101,6 @@
#include "components/safe_browsing/common/safe_browsing_prefs.h"
#include "components/search_engines/template_url_prepopulate_data.h"
#include "components/signin/core/browser/profile_management_switches.h"
-#include "components/ssl_config/ssl_config_service_manager.h"
#include "components/startup_metric_utils/browser/startup_metric_utils.h"
#include "components/subresource_filter/core/browser/ruleset_service.h"
#include "components/sync/base/sync_prefs.h"
@@ -372,7 +372,7 @@
rappor::RapporServiceImpl::RegisterPrefs(registry);
RegisterScreenshotPrefs(registry);
SigninManagerFactory::RegisterPrefs(registry);
- ssl_config::SSLConfigServiceManager::RegisterPrefs(registry);
+ SSLConfigServiceManager::RegisterPrefs(registry);
startup_metric_utils::RegisterPrefs(registry);
subresource_filter::IndexedRulesetVersion::RegisterPrefs(registry);
update_client::RegisterPrefs(registry);
