Componentize ssl_config_service_manager_pref.cc

components/ssl_config/ssl_config_service_manager_pref.cc

 // Copyright (c) 2012 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 "components/ssl_config/ssl_config_service_manager.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "base/prefs/pref_member.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
-#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/common/chrome_switches.h"
-#include "chrome/common/pref_names.h"
+#include "base/single_thread_task_runner.h"
 #include "components/content_settings/core/browser/content_settings_utils.h"
 #include "components/content_settings/core/common/content_settings.h"
-#include "content/public/browser/browser_thread.h"
+#include "components/ssl_config/ssl_config_prefs.h"
+#include "components/ssl_config/ssl_config_switches.h"
 #include "net/socket/ssl_client_socket.h"
 #include "net/ssl/ssl_cipher_suite_names.h"
 #include "net/ssl/ssl_config_service.h"
 
-using content::BrowserThread;
+namespace base {
+class SingleThreadTaskRunner;
+}
 
 namespace {
 
 // Converts a ListValue of StringValues into a vector of strings. Any Values
 // which cannot be converted will be skipped.
 std::vector<std::string> ListValueToStringVector(const base::ListValue* value) {
   std::vector<std::string> results;
   results.reserve(value->GetSize());
   std::string s;
   for (base::ListValue::const_iterator it = value->begin(); it != value->end();
@@ skipping 10 matching lines @@
 // cipher suites will be ignored.
 std::vector<uint16> ParseCipherSuites(
     const std::vector<std::string>& cipher_strings) {
   std::vector<uint16> cipher_suites;
   cipher_suites.reserve(cipher_strings.size());
 
   for (std::vector<std::string>::const_iterator it = cipher_strings.begin();
        it != cipher_strings.end(); ++it) {
     uint16 cipher_suite = 0;
     if (!net::ParseSSLCipherString(*it, &cipher_suite)) {
-      LOG(ERROR) << "Ignoring unrecognized or unparsable cipher suite: "
-                 << *it;
+      LOG(ERROR) << "Ignoring unrecognized or unparsable cipher suite: " << *it;
       continue;
     }
     cipher_suites.push_back(cipher_suite);
   }
   std::sort(cipher_suites.begin(), cipher_suites.end());
   return cipher_suites;
 }
 
 // Returns the SSL protocol version (as a uint16) represented by a string.
 // Returns 0 if the string is invalid.
@@ skipping 12 matching lines @@
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 //  SSLConfigServicePref
 
 // An SSLConfigService which stores a cached version of the current SSLConfig
 // prefs, which are updated by SSLConfigServiceManagerPref when the prefs
 // change.
 class SSLConfigServicePref : public net::SSLConfigService {
  public:
-  SSLConfigServicePref() {}
+  SSLConfigServicePref(

[Ryan Sleevi, 2015/09/08 21:02:16]

STYLE: Add 'explicit'
STYLE: Pass by const-ref.

[Abhishek, 2015/09/10 13:32:54]

Done.

+      scoped_refptr<base::SingleThreadTaskRunner> io_task_runner);
 
   // Store SSL config settings in |config|. Must only be called from IO thread.
   void GetSSLConfig(net::SSLConfig* config) override;
 
  private:
   // Allow the pref watcher to update our internal state.
   friend class SSLConfigServiceManagerPref;
 
   ~SSLConfigServicePref() override {}
 
   // This method is posted to the IO thread from the browser thread to carry the
   // new config information.
   void SetNewSSLConfig(const net::SSLConfig& new_config);
 
   // Cached value of prefs, should only be accessed from IO thread.
   net::SSLConfig cached_config_;
 
+  scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
+
   DISALLOW_COPY_AND_ASSIGN(SSLConfigServicePref);
 };
 
+SSLConfigServicePref::SSLConfigServicePref(
+    scoped_refptr<base::SingleThreadTaskRunner> io_task_runner)
+    : io_task_runner_(io_task_runner) {}
+
 void SSLConfigServicePref::GetSSLConfig(net::SSLConfig* config) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  DCHECK(io_task_runner_->BelongsToCurrentThread());
   *config = cached_config_;
 }
 
-void SSLConfigServicePref::SetNewSSLConfig(
-    const net::SSLConfig& new_config) {
+void SSLConfigServicePref::SetNewSSLConfig(const net::SSLConfig& new_config) {
   net::SSLConfig orig_config = cached_config_;
   cached_config_ = new_config;
   ProcessConfigUpdate(orig_config, new_config);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //  SSLConfigServiceManagerPref
 
 // The manager for holding and updating an SSLConfigServicePref instance.
-class SSLConfigServiceManagerPref
-    : public SSLConfigServiceManager {
+class SSLConfigServiceManagerPref : public ssl_config::SSLConfigServiceManager {
  public:
-  explicit SSLConfigServiceManagerPref(PrefService* local_state);
+  explicit SSLConfigServiceManagerPref(

[Ryan Sleevi, 2015/09/08 21:02:16]

STYLE: remove explicit, this is now a two-arg ctor.

[Abhishek, 2015/09/10 13:32:54]

Done.

+      PrefService* local_state,
+      scoped_refptr<base::SingleThreadTaskRunner> io_task_runner);

[Ryan Sleevi, 2015/09/08 21:02:16]

const-ref

[Abhishek, 2015/09/10 13:32:54]

Done.

   ~SSLConfigServiceManagerPref() override {}
 
   // Register local_state SSL preferences.
   static void RegisterPrefs(PrefRegistrySimple* registry);
 
   net::SSLConfigService* Get() override;
 
  private:
   // Callback for preference changes.  This will post the changes to the IO
   // thread with SetNewSSLConfig.
-  void OnPreferenceChanged(PrefService* prefs,
-                           const std::string& pref_name);
+  void OnPreferenceChanged(PrefService* prefs, const std::string& pref_name);
 
   // Store SSL config settings in |config|, directly from the preferences. Must
   // only be called from UI thread.
   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* local_state);
 
   PrefChangeRegistrar local_state_change_registrar_;
 
   // The local_state prefs (should only be accessed from UI thread)
   BooleanPrefMember rev_checking_enabled_;
   BooleanPrefMember rev_checking_required_local_anchors_;
   StringPrefMember ssl_version_min_;
   StringPrefMember ssl_version_max_;
   StringPrefMember ssl_version_fallback_min_;
   BooleanPrefMember ssl_record_splitting_disabled_;
 
   // The cached list of disabled SSL cipher suites.
   std::vector<uint16> disabled_cipher_suites_;
 
   scoped_refptr<SSLConfigServicePref> ssl_config_service_;
 
+  scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
+
   DISALLOW_COPY_AND_ASSIGN(SSLConfigServiceManagerPref);
 };
 
 SSLConfigServiceManagerPref::SSLConfigServiceManagerPref(
-    PrefService* local_state)
-    : ssl_config_service_(new SSLConfigServicePref()) {
+    PrefService* local_state,
+    scoped_refptr<base::SingleThreadTaskRunner> io_task_runner)
+    : ssl_config_service_(new SSLConfigServicePref(io_task_runner)),
+      io_task_runner_(io_task_runner) {
   DCHECK(local_state);
 
-  PrefChangeRegistrar::NamedChangeCallback local_state_callback = base::Bind(
-      &SSLConfigServiceManagerPref::OnPreferenceChanged,
-      base::Unretained(this),
-      local_state);
+  PrefChangeRegistrar::NamedChangeCallback local_state_callback =
+      base::Bind(&SSLConfigServiceManagerPref::OnPreferenceChanged,
+                 base::Unretained(this), local_state);
 
-  rev_checking_enabled_.Init(
-      prefs::kCertRevocationCheckingEnabled, local_state, local_state_callback);
+  rev_checking_enabled_.Init(ssl_config::prefs::kCertRevocationCheckingEnabled,
+                             local_state, local_state_callback);
   rev_checking_required_local_anchors_.Init(
-      prefs::kCertRevocationCheckingRequiredLocalAnchors,
-      local_state,
+      ssl_config::prefs::kCertRevocationCheckingRequiredLocalAnchors,
+      local_state, local_state_callback);
+  ssl_version_min_.Init(ssl_config::prefs::kSSLVersionMin, local_state,
+                        local_state_callback);
+  ssl_version_max_.Init(ssl_config::prefs::kSSLVersionMax, local_state,
+                        local_state_callback);
+  ssl_version_fallback_min_.Init(ssl_config::prefs::kSSLVersionFallbackMin,
+                                 local_state, local_state_callback);
+  ssl_record_splitting_disabled_.Init(
+      ssl_config::prefs::kDisableSSLRecordSplitting, local_state,
       local_state_callback);
-  ssl_version_min_.Init(
-      prefs::kSSLVersionMin, local_state, local_state_callback);
-  ssl_version_max_.Init(
-      prefs::kSSLVersionMax, local_state, local_state_callback);
-  ssl_version_fallback_min_.Init(
-      prefs::kSSLVersionFallbackMin, local_state, local_state_callback);
-  ssl_record_splitting_disabled_.Init(
-      prefs::kDisableSSLRecordSplitting, local_state, local_state_callback);
 
   local_state_change_registrar_.Init(local_state);
-  local_state_change_registrar_.Add(
-      prefs::kCipherSuiteBlacklist, local_state_callback);
+  local_state_change_registrar_.Add(ssl_config::prefs::kCipherSuiteBlacklist,
+                                    local_state_callback);
 
   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(PrefRegistrySimple* registry) {
   net::SSLConfig default_config;
-  registry->RegisterBooleanPref(prefs::kCertRevocationCheckingEnabled,
-                                default_config.rev_checking_enabled);
   registry->RegisterBooleanPref(
-      prefs::kCertRevocationCheckingRequiredLocalAnchors,
+      ssl_config::prefs::kCertRevocationCheckingEnabled,
+      default_config.rev_checking_enabled);
+  registry->RegisterBooleanPref(
+      ssl_config::prefs::kCertRevocationCheckingRequiredLocalAnchors,
       default_config.rev_checking_required_local_anchors);
-  registry->RegisterStringPref(prefs::kSSLVersionMin, std::string());
-  registry->RegisterStringPref(prefs::kSSLVersionMax, std::string());
-  registry->RegisterStringPref(prefs::kSSLVersionFallbackMin, std::string());
-  registry->RegisterBooleanPref(prefs::kDisableSSLRecordSplitting,
+  registry->RegisterStringPref(ssl_config::prefs::kSSLVersionMin,
+                               std::string());
+  registry->RegisterStringPref(ssl_config::prefs::kSSLVersionMax,
+                               std::string());
+  registry->RegisterStringPref(ssl_config::prefs::kSSLVersionFallbackMin,
+                               std::string());
+  registry->RegisterBooleanPref(ssl_config::prefs::kDisableSSLRecordSplitting,
                                 !default_config.false_start_enabled);
-  registry->RegisterListPref(prefs::kCipherSuiteBlacklist);
+  registry->RegisterListPref(ssl_config::prefs::kCipherSuiteBlacklist);
 }
 
 net::SSLConfigService* SSLConfigServiceManagerPref::Get() {
   return ssl_config_service_.get();
 }
 
 void SSLConfigServiceManagerPref::OnPreferenceChanged(
     PrefService* prefs,
     const std::string& pref_name_in) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(prefs);
-  if (pref_name_in == prefs::kCipherSuiteBlacklist)
+  if (pref_name_in == ssl_config::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,
-      base::Bind(
-          &SSLConfigServicePref::SetNewSSLConfig,
-          ssl_config_service_.get(),
-          new_config));
+  io_task_runner_->PostTask(FROM_HERE,
+                            base::Bind(&SSLConfigServicePref::SetNewSSLConfig,
+                                       ssl_config_service_.get(), new_config));
 }
 
 void SSLConfigServiceManagerPref::GetSSLConfigFromPrefs(
     net::SSLConfig* config) {
   // rev_checking_enabled was formerly a user-settable preference, but now
   // it is managed-only.
   if (rev_checking_enabled_.IsManaged())
     config->rev_checking_enabled = rev_checking_enabled_.GetValue();
   else
     config->rev_checking_enabled = false;
@@ skipping 20 matching lines @@
     config->version_fallback_min = version_fallback_min;
   }
   config->disabled_cipher_suites = disabled_cipher_suites_;
   // disabling False Start also happens to disable record splitting.
   config->false_start_enabled = !ssl_record_splitting_disabled_.GetValue();
 }
 
 void SSLConfigServiceManagerPref::OnDisabledCipherSuitesChange(
     PrefService* local_state) {
   const base::ListValue* value =
-      local_state->GetList(prefs::kCipherSuiteBlacklist);
+      local_state->GetList(ssl_config::prefs::kCipherSuiteBlacklist);
   disabled_cipher_suites_ = ParseCipherSuites(ListValueToStringVector(value));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //  SSLConfigServiceManager
 
+namespace ssl_config {
 // static
 SSLConfigServiceManager* SSLConfigServiceManager::CreateDefaultManager(
-    PrefService* local_state) {
-  return new SSLConfigServiceManagerPref(local_state);
+    PrefService* local_state,
+    scoped_refptr<base::SingleThreadTaskRunner> io_task_runner) {

[Ryan Sleevi, 2015/09/08 21:02:16]

const-ref

[Abhishek, 2015/09/10 13:32:54]

Done.

+  return new SSLConfigServiceManagerPref(local_state, io_task_runner);
 }
 
 // static
 void SSLConfigServiceManager::RegisterPrefs(PrefRegistrySimple* registry) {
   SSLConfigServiceManagerPref::RegisterPrefs(registry);
 }
+}  // namespace ssl_config