Add back prefs::kSSL3Enabled and prefs::kTLS1Enabled, but control

chrome/browser/net/ssl_config_service_manager_pref.cc

 // Copyright (c) 2011 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 "chrome/browser/net/ssl_config_service_manager.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/command_line.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_notification_types.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
 #include "net/base/ssl_cipher_suite_names.h"
 #include "net/base/ssl_config_service.h"
 
 namespace {
 
 // Converts a ListValue of StringValues into a vector of strings. Any Values
@@ skipping 94 matching lines @@
   // Callback for preference changes.  This will post the changes to the IO
   // thread with SetNewSSLConfig.
   virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
   // Store SSL config settings in |config|, directly from the preferences. Must
   // only be called from UI thread.
   void GetSSLConfigFromPrefs(net::SSLConfig* config);
 
+  void OnSSL3EnabledChange(PrefService* prefs);
+  void OnTLS1EnabledChange(PrefService* prefs);
+
   // Processes changes to the disabled cipher suites preference, updating the
   // cached list of parsed SSL/TLS cipher suites that are disabled.
   void OnDisabledCipherSuitesChange(PrefService* prefs);
 
   PrefChangeRegistrar pref_change_registrar_;
 
   // The prefs (should only be accessed from UI thread)
   BooleanPrefMember rev_checking_enabled_;
 
+  // The cached booleans of enabled SSL/TLS versions.
+  bool ssl3_enabled_;

[Ryan Sleevi, 2011/08/27 14:14:42]

nit: You can probably simplify things just using a BooleanPrefMember, but that's
up to you if you want to. If you do go that route, you can delete lines 129-30,
165-166, 197-200, 227-234

[wtc, 2011/08/27 20:27:06]

Thanks a lot for the suggestion of using a BooleanPrefMember.

I think the two pref_change_registrar_.Add() calls on
lines 161-162 should also be deleted, right?

161 pref_change_registrar_.Add(prefs::kSSL3Enabled, this);
162 pref_change_registrar_.Add(prefs::kTLS1Enabled, this);

+  bool tls1_enabled_;
+
   // The cached list of disabled SSL cipher suites.
   std::vector<uint16> disabled_cipher_suites_;
 
   scoped_refptr<SSLConfigServicePref> ssl_config_service_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLConfigServiceManagerPref);
 };
 
 SSLConfigServiceManagerPref::SSLConfigServiceManagerPref(
     PrefService* local_state)
     : ssl_config_service_(new SSLConfigServicePref()) {
   DCHECK(local_state);
 
   rev_checking_enabled_.Init(prefs::kCertRevocationCheckingEnabled,
                              local_state, this);
   pref_change_registrar_.Init(local_state);
+  pref_change_registrar_.Add(prefs::kSSL3Enabled, this);
+  pref_change_registrar_.Add(prefs::kTLS1Enabled, this);
   pref_change_registrar_.Add(prefs::kCipherSuiteBlacklist, this);
 
+  OnSSL3EnabledChange(local_state);
+  OnTLS1EnabledChange(local_state);
   OnDisabledCipherSuitesChange(local_state);
   // 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::RegisterPrefs(PrefService* prefs) {
   net::SSLConfig default_config;
   prefs->RegisterBooleanPref(prefs::kCertRevocationCheckingEnabled,
                              default_config.rev_checking_enabled);
+  prefs->RegisterBooleanPref(prefs::kSSL3Enabled,
+                             default_config.ssl3_enabled);
+  prefs->RegisterBooleanPref(prefs::kTLS1Enabled,
+                             default_config.tls1_enabled);
   prefs->RegisterListPref(prefs::kCipherSuiteBlacklist);
 }
 
 net::SSLConfigService* SSLConfigServiceManagerPref::Get() {
   return ssl_config_service_;
 }
 
 void SSLConfigServiceManagerPref::Observe(int type,
                                           const NotificationSource& source,
                                           const NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_PREF_CHANGED) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     std::string* pref_name_in = Details<std::string>(details).ptr();
     PrefService* prefs = Source<PrefService>(source).ptr();
     DCHECK(pref_name_in && prefs);
+    if (*pref_name_in == prefs::kSSL3Enabled)
+      OnSSL3EnabledChange(prefs);
+    if (*pref_name_in == prefs::kTLS1Enabled)

[Ryan Sleevi, 2011/08/27 14:14:42]

nit: else if here and line 201?

+      OnTLS1EnabledChange(prefs);
     if (*pref_name_in == prefs::kCipherSuiteBlacklist)
       OnDisabledCipherSuitesChange(prefs);
 
     net::SSLConfig new_config;
     GetSSLConfigFromPrefs(&new_config);
 
     // Post a task to |io_loop| with the new configuration, so it can
     // update |cached_config_|.
     BrowserThread::PostTask(
         BrowserThread::IO,
         FROM_HERE,
         NewRunnableMethod(
             ssl_config_service_.get(),
             &SSLConfigServicePref::SetNewSSLConfig,
             new_config));
   }
 }
 
 void SSLConfigServiceManagerPref::GetSSLConfigFromPrefs(
     net::SSLConfig* config) {
   config->rev_checking_enabled = rev_checking_enabled_.GetValue();
-
-  config->ssl3_enabled =
-      !CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableSSL3);
-  config->tls1_enabled =
-      !CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableTLS1);
-
+  config->ssl3_enabled = ssl3_enabled_;
+  config->tls1_enabled = tls1_enabled_;
   config->disabled_cipher_suites = disabled_cipher_suites_;
   SSLConfigServicePref::SetSSLConfigFlags(config);
 }
 
+void SSLConfigServiceManagerPref::OnSSL3EnabledChange(PrefService* prefs) {
+  ssl3_enabled_ = prefs->GetBoolean(prefs::kSSL3Enabled);
+}
+
+void SSLConfigServiceManagerPref::OnTLS1EnabledChange(PrefService* prefs) {
+  tls1_enabled_ = prefs->GetBoolean(prefs::kTLS1Enabled);
+}
+
 void SSLConfigServiceManagerPref::OnDisabledCipherSuitesChange(
     PrefService* prefs) {
   const ListValue* value = prefs->GetList(prefs::kCipherSuiteBlacklist);
   disabled_cipher_suites_ = ParseCipherSuites(ListValueToStringVector(value));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //  SSLConfigServiceManager
 
 // static
 SSLConfigServiceManager* SSLConfigServiceManager::CreateDefaultManager(
     PrefService* local_state) {
   return new SSLConfigServiceManagerPref(local_state);
 }
 
 // static
 void SSLConfigServiceManager::RegisterPrefs(PrefService* prefs) {
   SSLConfigServiceManagerPref::RegisterPrefs(prefs);
 }