| Index: chrome/browser/prefs/browser_prefs.cc
|
| diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
|
| index 426d7bfedee5995369f7895c05c815d8529e8e26..67a9b93790f9f2f825413bc02c04365d728a80e6 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/message_center_notification_manager.h"
|
| #include "chrome/browser/notifications/notifier_state_tracker.h"
|
| @@ -85,6 +84,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/translate/core/browser/translate_prefs.h"
|
| #include "components/variations/service/variations_service.h"
|
| @@ -261,7 +261,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
|
| rappor::RapporService::RegisterPrefs(registry);
|
| RegisterScreenshotPrefs(registry);
|
| SigninManagerFactory::RegisterPrefs(registry);
|
| - SSLConfigServiceManager::RegisterPrefs(registry);
|
| + ssl_config::SSLConfigServiceManager::RegisterPrefs(registry);
|
| UpgradeDetector::RegisterPrefs(registry);
|
| web_resource::PromoResourceService::RegisterPrefs(registry);
|
|
|
|
|