Use separate SSL session caches per profile

chrome/browser/net/ssl_config_service_manager_pref.cc

Index: chrome/browser/net/ssl_config_service_manager_pref.cc
diff --git a/chrome/browser/net/ssl_config_service_manager_pref.cc b/chrome/browser/net/ssl_config_service_manager_pref.cc
index d024f72b6d132c98f6dfa1d1259611a48682c5cb..20686f2375f6201e5dd45cec9f2e5bbc10b7e07c 100644
--- a/chrome/browser/net/ssl_config_service_manager_pref.cc
+++ b/chrome/browser/net/ssl_config_service_manager_pref.cc
@@ -108,12 +108,18 @@ SSLConfigServiceManagerPref::SSLConfigServiceManagerPref(Profile* profile)
 // static
 void SSLConfigServiceManagerPref::RegisterUserPrefs(PrefService* user_prefs) {
   net::SSLConfig default_config;
-  user_prefs->RegisterBooleanPref(prefs::kCertRevocationCheckingEnabled,
-                                  default_config.rev_checking_enabled);
-  user_prefs->RegisterBooleanPref(prefs::kSSL3Enabled,
-                                  default_config.ssl3_enabled);
-  user_prefs->RegisterBooleanPref(prefs::kTLS1Enabled,
-                                  default_config.tls1_enabled);
+  // We must check with FindPreference as an OffTheRecordProfileImpl
+  // may already have these preferences registered by its parent
+  // profile.
+  if (!user_prefs->FindPreference(prefs::kCertRevocationCheckingEnabled))
+    user_prefs->RegisterBooleanPref(prefs::kCertRevocationCheckingEnabled,
+                                    default_config.rev_checking_enabled);
+  if (!user_prefs->FindPreference(prefs::kSSL3Enabled))
+    user_prefs->RegisterBooleanPref(prefs::kSSL3Enabled,
+                                    default_config.ssl3_enabled);
+  if (!user_prefs->FindPreference(prefs::kTLS1Enabled))
+    user_prefs->RegisterBooleanPref(prefs::kTLS1Enabled,
+                                    default_config.tls1_enabled);
 }
 
 net::SSLConfigService* SSLConfigServiceManagerPref::Get() {
@@ -144,7 +150,7 @@ void SSLConfigServiceManagerPref::GetSSLConfigFromPrefs(
   config->rev_checking_enabled = rev_checking_enabled_.GetValue();
   config->ssl3_enabled = ssl3_enabled_.GetValue();
   config->tls1_enabled = tls1_enabled_.GetValue();
-  SSLConfigServicePref::SetSSLConfigFlags(config);
+  ssl_config_service_->SetSSLConfigFlags(config);
 }
 
 ////////////////////////////////////////////////////////////////////////////////