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 43 matching lines @@
   // |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.
   void RecordBypassedBytesHistograms(
       net::URLRequest& request,
-      const BooleanPrefMember& data_reduction_proxy_enabled);
+      const BooleanPrefMember& data_reduction_proxy_enabled,
+      const net::ProxyConfig& data_reduction_proxy_config);

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

Update the comment to describe this parameter.

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

Done.

 
   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_PAC,              /* Bypass due to managed config. */

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

This isn't quite right. I'd call this MANAGED_PROXY_CONFIG, because it doesn't
necessary have to be a PAC.

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

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_