Fixing DataReductionProxy.BypassedBytes.LocalBypassRules

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"
 #include "base/metrics/field_trial.h"
 #include "base/time/time.h"
 #include "components/data_reduction_proxy/common/data_reduction_proxy_switches.h"
 #include "net/base/host_port_pair.h"
+#include "net/proxy/proxy_config.h"
 #include "net/proxy/proxy_info.h"
 #include "net/proxy/proxy_retry_info.h"
 #include "net/proxy/proxy_server.h"
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 #include "url/url_constants.h"
 
 using base::FieldTrialList;
 
@@ skipping 334 matching lines @@
   net::ProxyInfo result;
   request->context()->proxy_service()->config().proxy_rules().Apply(
       request->url(), &result);
   if (!result.proxy_server().is_valid())
     return false;
   if (result.proxy_server().is_direct())
     return false;
   return IsDataReductionProxy(result.proxy_server().host_port_pair(), NULL);
 }
 
+bool DataReductionProxyParams::PassesDataReductionProxyLocalBypassRules(

[bengr, 2014/08/29 19:29:48]

Maybe rename as IsBypassedByDataReductionProxyLocalRules()

[megjablon, 2014/08/29 20:26:32]

Ya, I like that better

+    const net::URLRequest& request,
+    const net::ProxyConfig& data_reduction_proxy_config) {

[bengr, 2014/08/29 19:29:48]

It looks like this function can be const.

[megjablon, 2014/08/29 20:26:32]

Done.

+  DCHECK(request.context());
+  DCHECK(request.context()->proxy_service());
+  net::ProxyInfo result;
+  data_reduction_proxy_config.proxy_rules().Apply(
+      request.url(), &result);
+  if (!result.proxy_server().is_valid())
+    return false;
+  if (result.proxy_server().is_direct())
+    return false;
+  return IsDataReductionProxy(result.proxy_server().host_port_pair(), NULL);
+}
+
 std::string DataReductionProxyParams::GetDefaultDevOrigin() const {
 #if defined(DATA_REDUCTION_DEV_HOST)
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kDisableDataReductionProxyDev))
     return std::string();
   if (command_line.HasSwitch(switches::kEnableDataReductionProxyDev) ||
       (FieldTrialList::FindFullName("DataCompressionProxyDevRollout") ==
          kEnabled)) {
     return DATA_REDUCTION_DEV_HOST;
   }
@@ skipping 129 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