Revert 273810 "Added alternative configuration for the data redu..."

trunk/src/components/data_reduction_proxy/browser/data_reduction_proxy_config_service.cc

Index: trunk/src/components/data_reduction_proxy/browser/data_reduction_proxy_config_service.cc
===================================================================
--- trunk/src/components/data_reduction_proxy/browser/data_reduction_proxy_config_service.cc	(revision 273823)
+++ trunk/src/components/data_reduction_proxy/browser/data_reduction_proxy_config_service.cc	(working copy)
@@ -130,8 +130,7 @@
     bool primary_restricted,
     bool fallback_restricted,
     const std::string& primary_origin,
-    const std::string& fallback_origin,
-    const std::string& ssl_origin) {
+    const std::string& fallback_origin) {
 
   std::vector<std::string> proxies;
   if (!primary_restricted) {
@@ -152,14 +151,9 @@
     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(server);
+  config.proxy_rules().ParseFromString(
+      "http=" + JoinString(proxies, ",") + ",direct://;");
   config.proxy_rules().bypass_rules.ParseFromString(
       JoinString(bypass_rules_, ", "));
   UpdateProxyConfigOnIOThread(true, config);