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

BUG=388987

Review URL: https://codereview.chromium.org/577123003

Cr-Commit-Position: refs/heads/master@{#295586}

components/data_reduction_proxy/browser/data_reduction_proxy_params.cc

@@ -122,10 +122,6 @@ 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_);
@@ -301,22 +297,6 @@ bool DataReductionProxyParams::IsDataReductionProxy(
     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) {

components/data_reduction_proxy/browser/data_reduction_proxy_params_unittest.cc

@@ -577,11 +577,9 @@ TEST_F(DataReductionProxyParamsTest, IsDataReductionProxy) {
             TestDataReductionProxyParams::DefaultOrigin())),
         true,
         true,
-        true,
-        net::HostPortPair::FromURL(GURL(
-            TestDataReductionProxyParams::DefaultOrigin())),
-        net::HostPortPair::FromURL(GURL(
-            TestDataReductionProxyParams::DefaultDevFallbackOrigin())),
+        false,
+        net::HostPortPair::FromURL(GURL()),
+        net::HostPortPair::FromURL(GURL()),
         false,
         false,
         false