Use separate SSL session caches per profile

chrome/browser/net/ssl_config_service_manager_pref.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/message_loop.h"
 #include "base/thread.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/ssl_config_service_manager.h"
 #include "chrome/browser/prefs/pref_member.h"
@@ skipping 90 matching lines @@
   tls1_enabled_.Init(prefs::kTLS1Enabled, profile->GetPrefs(), this);
 
   // Initialize from UI thread.  This is okay as there shouldn't be anything on
   // the IO thread trying to access it yet.
   GetSSLConfigFromPrefs(&ssl_config_service_->cached_config_);
 }
 
 // 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() {
   return ssl_config_service_;
 }
 
 void SSLConfigServiceManagerPref::Observe(NotificationType type,
                                           const NotificationSource& source,
                                           const NotificationDetails& details) {
   base::Thread* io_thread = g_browser_process->io_thread();
@@ skipping 10 matching lines @@
             &SSLConfigServicePref::SetNewSSLConfig,
             new_config));
   }
 }
 
 void SSLConfigServiceManagerPref::GetSSLConfigFromPrefs(
     net::SSLConfig* config) {
   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);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //  SSLConfigServiceManager
 
 // static
 SSLConfigServiceManager* SSLConfigServiceManager::CreateDefaultManager(
     Profile* profile) {
   return new SSLConfigServiceManagerPref(profile);
 }