Demote the Use SSL 3.0 and Use TLS 1.0 options from Under The Hood to

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 102 matching lines @@
   void GetSSLConfigFromPrefs(net::SSLConfig* config);
 
   // 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_;
-  BooleanPrefMember ssl3_enabled_;
-  BooleanPrefMember tls1_enabled_;
 
   // The cached list of disabled SSL cipher suites.
   std::vector<uint16> disabled_cipher_suites_;

[wtc, 2011/08/24 19:37:30]

It seems strange that ssl3_enabled_ and tls1_enabled_
are gone but disabled_cipher_suites_ is still here.

Is the disabled_cipher_suites_ preference managed in a
different way?  Perhaps it can only be changed by a group
policy.

 
   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);
-  ssl3_enabled_.Init(prefs::kSSL3Enabled, local_state, this);
-  tls1_enabled_.Init(prefs::kTLS1Enabled, local_state, this);
   pref_change_registrar_.Init(local_state);
   pref_change_registrar_.Add(prefs::kCipherSuiteBlacklist, this);
 
   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) {
@@ skipping 16 matching lines @@
         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 = ssl3_enabled_.GetValue();
-  config->tls1_enabled = tls1_enabled_.GetValue();
+
+  config->ssl3_enabled =
+    !(CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableSSL3));
+  config->tls1_enabled =
+    !(CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableTLS1));

[wtc, 2011/08/24 19:37:30]

Nit: omit the outer parentheses ().

Line 207 and line 209 (continuation lines) should be indented
with four spaces.

Nit: Since the command-line options do not change, it seems that
we can call CommandLine::ForCurrentProcess()->HasSwitch()
just once in the constructor (line 155) and save the
results in class members.

+
   config->disabled_cipher_suites = disabled_cipher_suites_;
   SSLConfigServicePref::SetSSLConfigFlags(config);
 }
 
 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);
 }