Remove primary data reduction proxy workaround added by crbug.com/388358.

components/data_reduction_proxy/browser/data_reduction_proxy_params.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_params.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 99 matching lines @@
 }
 
 DataReductionProxyParams::~DataReductionProxyParams() {
 }
 
 DataReductionProxyParams::DataReductionProxyList
 DataReductionProxyParams::GetAllowedProxies() const {
   DataReductionProxyList list;
   if (allowed_) {
     list.push_back(origin_);
-    // TODO(bolian): revert this once the proxy PAC fix is ready.
-    if (GURL(GetDefaultDevOrigin()) == origin()) {
-      list.push_back(GURL(GetDefaultOrigin()));
-    }
   }
   if (allowed_ && fallback_allowed_)
     list.push_back(fallback_origin_);
   if (alt_allowed_) {
     list.push_back(alt_origin_);
     list.push_back(ssl_origin_);
   }
   if (alt_allowed_ && fallback_allowed_)
     list.push_back(alt_fallback_origin_);
   return list;
@@ skipping 155 matching lines @@
     DataReductionProxyTypeInfo* proxy_info) const {
   if (net::HostPortPair::FromURL(origin()).Equals(host_port_pair)) {
     if (proxy_info) {
       proxy_info->proxy_servers.first = origin();
       if (fallback_allowed())
         proxy_info->proxy_servers.second = fallback_origin();
     }
     return true;
   }
 
-  // TODO(bolian): revert this once the proxy PAC fix is ready.
-  //
-  // If dev host is configured as the primary proxy, we treat the default
-  // origin as a valid data reduction proxy to workaround PAC script.
-  if (GURL(GetDefaultDevOrigin()) == origin()) {
-    const GURL& default_origin = GURL(GetDefaultOrigin());
-    if (net::HostPortPair::FromURL(default_origin).Equals(host_port_pair)) {
-      if (proxy_info) {
-        proxy_info->proxy_servers.first = default_origin;
-        if (fallback_allowed())
-          proxy_info->proxy_servers.second = fallback_origin();
-      }
-      return true;
-    }
-  }
-
   if (fallback_allowed() &&
       net::HostPortPair::FromURL(fallback_origin()).Equals(host_port_pair)) {
     if (proxy_info) {
       proxy_info->proxy_servers.first = fallback_origin();
       proxy_info->proxy_servers.second = GURL();
       proxy_info->is_fallback = true;
     }
     return true;
   }
   if (net::HostPortPair::FromURL(alt_origin()).Equals(host_port_pair)) {
@@ skipping 215 matching lines @@
 }
 
 std::string DataReductionProxyParams::GetDefaultWarmupURL() const {
 #if defined(DATA_REDUCTION_PROXY_WARMUP_URL)
   return DATA_REDUCTION_PROXY_WARMUP_URL;
 #endif
   return std::string();
 }
 
 }  // namespace data_reduction_proxy