Index: chrome/browser/prefs/browser_prefs.cc |
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc |
index 912825dc861d4ce8900e0ca42de69f4dccc86873..fbd17bb2d13ff4a4e575318d41491795517618dd 100644 |
--- a/chrome/browser/prefs/browser_prefs.cc |
+++ b/chrome/browser/prefs/browser_prefs.cc |
@@ -35,7 +35,6 @@ |
#include "chrome/browser/net/net_pref_observer.h" |
#include "chrome/browser/net/prediction_options.h" |
#include "chrome/browser/net/predictor.h" |
-#include "chrome/browser/net/ssl_config_service_manager.h" |
#include "chrome/browser/notifications/extension_welcome_notification.h" |
#include "chrome/browser/notifications/notifier_state_tracker.h" |
#include "chrome/browser/pepper_flash_settings_manager.h" |
@@ -82,6 +81,7 @@ |
#include "components/proxy_config/pref_proxy_config_tracker_impl.h" |
#include "components/rappor/rappor_service.h" |
#include "components/search_engines/template_url_prepopulate_data.h" |
+#include "components/ssl_config/ssl_config_service_manager.h" |
#include "components/sync_driver/sync_prefs.h" |
#include "components/syncable_prefs/pref_service_syncable.h" |
#include "components/translate/core/browser/translate_prefs.h" |
@@ -263,7 +263,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { |
rappor::RapporService::RegisterPrefs(registry); |
RegisterScreenshotPrefs(registry); |
SigninManagerFactory::RegisterPrefs(registry); |
- SSLConfigServiceManager::RegisterPrefs(registry); |
+ ssl_config::SSLConfigServiceManager::RegisterPrefs(registry); |
web_resource::PromoResourceService::RegisterPrefs(registry); |
#if defined(ENABLE_AUTOFILL_DIALOG) |