Added alternative configuration for the data reduction proxy

chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.cc

 // Copyright 2014 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/spdyproxy/data_reduction_proxy_chrome_configurator.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/prefs/proxy_prefs.h"
 #include "chrome/common/pref_names.h"
 
 DataReductionProxyChromeConfigurator::DataReductionProxyChromeConfigurator(
     PrefService* prefs) : prefs_(prefs) {
   DCHECK(prefs);
 }
 
 DataReductionProxyChromeConfigurator::~DataReductionProxyChromeConfigurator() {
 }
 
-void DataReductionProxyChromeConfigurator::Enable(bool primary_restricted,
-                                                  bool fallback_restricted,
-                                      const std::string& primary_origin,
-                                      const std::string& fallback_origin) {
+void DataReductionProxyChromeConfigurator::Enable(
+    bool primary_restricted,
+    bool fallback_restricted,
+    const std::string& primary_origin,
+    const std::string& fallback_origin,
+    const std::string& ssl_origin) {
   DCHECK(prefs_);
   DictionaryPrefUpdate update(prefs_, prefs::kProxy);
   base::DictionaryValue* dict = update.Get();
 
   std::vector<std::string> proxies;
   if (!primary_restricted) {
     std::string trimmed_primary;
     base::TrimString(primary_origin, "/", &trimmed_primary);
     if (!trimmed_primary.empty())
       proxies.push_back(trimmed_primary);
   }
   if (!fallback_restricted) {
     std::string trimmed_fallback;
     base::TrimString(fallback_origin, "/", &trimmed_fallback);
     if (!trimmed_fallback.empty())
       proxies.push_back(trimmed_fallback);
   }
   if (proxies.empty()) {
     std::string mode;
     // If already in a disabled mode, do nothing.
     if (dict->GetString("mode", &mode))
       if (ProxyModeToString(ProxyPrefs::MODE_SYSTEM) == mode)
         return;
     Disable();
     return;
   }
 
-  dict->SetString("server", "http=" + JoinString(proxies, ",") + ",direct://;");
+  std::string trimmed_ssl;
+  base::TrimString(ssl_origin, "/", &trimmed_ssl);
+
+  std::string server = "http=" + JoinString(proxies, ",") + ",direct://;"
+      + (ssl_origin.empty() ? "" : ("https=" + trimmed_ssl + ",direct://;"));
+
+  dict->SetString("server", server);
   dict->SetString("mode", ProxyModeToString(ProxyPrefs::MODE_FIXED_SERVERS));
   dict->SetString("bypass_list", JoinString(bypass_rules_, ", "));
 }
 
 void DataReductionProxyChromeConfigurator::Disable() {
   DCHECK(prefs_);
   DictionaryPrefUpdate update(prefs_, prefs::kProxy);
   base::DictionaryValue* dict = update.Get();
   dict->SetString("mode", ProxyModeToString(ProxyPrefs::MODE_SYSTEM));
   dict->SetString("server", "");
@@ skipping 12 matching lines @@
     pos = pattern.find('/', pos + 2);
 
   std::string host_pattern;
   if (pos != std::string::npos)
     host_pattern = pattern.substr(0, pos);
   else
     host_pattern = pattern;
 
   AddHostPatternToBypass(host_pattern);
 }