Fixing DataReductionProxy.BypassedBytes.LocalBypassRules

components/data_reduction_proxy/browser/data_reduction_proxy_usage_stats.h

 // 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.
 
 #ifndef COMPONENTS_DATA_REDUCTION_PROXY_BROWSER_DATA_REDUCTION_PROXY_USAGE_STATS_H_
 #define COMPONENTS_DATA_REDUCTION_PROXY_BROWSER_DATA_REDUCTION_PROXY_USAGE_STATS_H_
 
 #include "base/callback.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/prefs/pref_member.h"
@@ skipping 37 matching lines @@
 
   // Callback intended to be called from |ChromeNetworkDelegate| when a
   // request completes. This method is used to gather usage stats.
   void OnUrlRequestCompleted(const net::URLRequest* request, bool started);
 
   // Records the last bypass reason to |bypass_type_| and sets
   // |triggering_request_| to true. A triggering request is the first request to
   // cause the current bypass.
   void SetBypassType(DataReductionProxyBypassType type);
 
-  // Given the |content_length| and associated |request|, records the
-  // number of bypassed bytes for that |request| into UMAs based on bypass type.
-  // |data_reduction_proxy_enabled| tells us the state of the
-  // kDataReductionProxyEnabled preference.
+  // Given the |content_length|, associated |request|, and the
+  // |data_reduction_proxy_config| records the number of bypassed bytes for that
+  // |request| into UMAs based on bypass type. |data_reduction_proxy_enabled|
+  // tells us the state of the kDataReductionProxyEnabled preference.
   void RecordBypassedBytesHistograms(
       net::URLRequest& request,
-      const BooleanPrefMember& data_reduction_proxy_enabled);
+      const BooleanPrefMember& data_reduction_proxy_enabled,
+      const net::ProxyConfig& data_reduction_proxy_config);
 
   void RecordBypassEventHistograms(const net::ProxyServer& bypassed_proxy,
                                    int net_error) const;
 
  private:
   enum BypassedBytesType {
     NOT_BYPASSED = 0,         /* Not bypassed. */
     SSL,                      /* Bypass due to SSL. */
     LOCAL_BYPASS_RULES,       /* Bypass due to client-side bypass rules. */
+    MANAGED_PROXY_CONFIG,              /* Bypass due to managed config. */

[bengr, 2014/09/02 05:11:38]

indent of comment.

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

Done.

     AUDIO_VIDEO,              /* Audio/Video bypass. */
     TRIGGERING_REQUEST,       /* Triggering request bypass. */
     NETWORK_ERROR,            /* Network error. */
     BYPASSED_BYTES_TYPE_MAX   /* This must always be last.*/
   };
 
   // NetworkChangeNotifier::NetworkChangeObserver:
   virtual void OnNetworkChanged(
       net::NetworkChangeNotifier::ConnectionType type) OVERRIDE;
 
@@ skipping 45 matching lines @@
 
   // Called when the unavailability status has changed. Runs on the UI thread.
   base::Callback<void(bool)> unavailable_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(DataReductionProxyUsageStats);
 };
 
 }  // namespace data_reduction_proxy
 
 #endif  // COMPONENTS_DATA_REDUCTION_PROXY_BROWSER_DATA_REDUCTION_PROXY_USAGE_STATS_H_