Fixing DataReductionProxy.BypassedBytes.LocalBypassRules

chrome/browser/net/chrome_network_delegate.cc

 // Copyright (c) 2012 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 "chrome/browser/net/chrome_network_delegate.h"
 
 #include <stdlib.h>
 
 #include <vector>
 
@@ skipping 565 matching lines @@
       int64 adjusted_original_content_length =
           data_reduction_proxy::GetAdjustedOriginalContentLength(
               request_type, original_content_length,
               received_content_length);
       AccumulateContentLength(received_content_length,
                               adjusted_original_content_length,
                               request_type);
       RecordContentLengthHistograms(received_content_length,
                                     original_content_length,
                                     freshness_lifetime);
-      if (data_reduction_proxy_enabled_ && data_reduction_proxy_usage_stats_) {
+      if (data_reduction_proxy_enabled_ &&
+          data_reduction_proxy_usage_stats_ &&
+          !proxy_config_getter_.is_null()) {
         data_reduction_proxy_usage_stats_->RecordBypassedBytesHistograms(
-            *request, *data_reduction_proxy_enabled_);
+            *request,
+            *data_reduction_proxy_enabled_,
+            proxy_config_getter_.Run());

[mmenke, 2014/09/02 14:30:52]

Can't RecordBypassedBytesHistograms just use request->proxy_server()?  Looking
at the config rather than what proxy was actually used seems weird to me.

[megjablon, 2014/09/02 21:00:16]

To know if the proxy was bypassed because of the data reduction proxy bypass
rules, we need to have the data reduction proxy config to have a handle to those
rules. We also want to know if the effective config is the data reduction proxy
config. This tells us if a managed proxy config is being used and overriding the
use of the data reduction proxy config.

       }
       DVLOG(2) << __FUNCTION__
           << " received content length: " << received_content_length
           << " original content length: " << original_content_length
           << " url: " << request->url();
     }
 
     extensions_delegate_->OnCompleted(request, started);
   } else if (request->status().status() == net::URLRequestStatus::FAILED ||
              request->status().status() == net::URLRequestStatus::CANCELED) {
@@ skipping 218 matching lines @@
     data_reduction_proxy::DataReductionProxyRequestType request_type) {
   DCHECK_GE(received_content_length, 0);
   DCHECK_GE(original_content_length, 0);
   StoreAccumulatedContentLength(received_content_length,
                                 original_content_length,
                                 request_type,
                                 reinterpret_cast<Profile*>(profile_));
   received_content_length_ += received_content_length;
   original_content_length_ += original_content_length;
 }