Added alternative configuration for the data reduction proxy

components/data_reduction_proxy/browser/data_reduction_proxy_config_service.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 "components/data_reduction_proxy/browser/data_reduction_proxy_config_service.h"
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
@@ skipping 112 matching lines @@
   DCHECK(config_service);
 }
 
 DataReductionProxyConfigTracker::~DataReductionProxyConfigTracker() {
 }
 
 void DataReductionProxyConfigTracker::Enable(
     bool primary_restricted,
     bool fallback_restricted,
     const std::string& primary_origin,
-    const std::string& fallback_origin) {
+    const std::string& fallback_origin,
+    const std::string& ssl_origin) {
 
   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;
     Disable();
     return;
   }
 
+  std::string trimmed_ssl;
+  base::TrimString(ssl_origin, "/", &trimmed_ssl);
+
+  std::string server = "http=" + JoinString(proxies, ",") + ",direct://;"
+      + (ssl_origin.empty() ? "" : ("https=" + ssl_origin + ",direct://;"));
+
   net::ProxyConfig config;
-  config.proxy_rules().ParseFromString(
-      "http=" + JoinString(proxies, ",") + ",direct://;");
+  config.proxy_rules().ParseFromString(server);
   config.proxy_rules().bypass_rules.ParseFromString(
       JoinString(bypass_rules_, ", "));
   UpdateProxyConfigOnIOThread(true, config);
 }
 
 
 void DataReductionProxyConfigTracker::Disable() {
   net::ProxyConfig config = net::ProxyConfig::CreateDirect();
   UpdateProxyConfigOnIOThread(false, config);
 }
@@ skipping 22 matching lines @@
     bool enabled,
     const net::ProxyConfig& config) {
   task_runner_->PostTask(FROM_HERE,
       base::Bind(
           &DataReductionProxyConfigService::UpdateProxyConfig,
           base::Unretained(config_service_),
           enabled, config));
 }
 
 }  // namespace data_reduction_proxy