Bypass data reduction proxy when using VPN

components/data_reduction_proxy/browser/data_reduction_proxy_settings.h

Index: components/data_reduction_proxy/browser/data_reduction_proxy_settings.h
diff --git a/components/data_reduction_proxy/browser/data_reduction_proxy_settings.h b/components/data_reduction_proxy/browser/data_reduction_proxy_settings.h
index 9db618e19085fcfd9017f51d9f3e25a8efa08c19..fb798d9d5e9c7f358ccc6ff3acd7850b56dcb64f 100644
--- a/components/data_reduction_proxy/browser/data_reduction_proxy_settings.h
+++ b/components/data_reduction_proxy/browser/data_reduction_proxy_settings.h
@@ -16,6 +16,7 @@
 #include "components/data_reduction_proxy/browser/data_reduction_proxy_configurator.h"
 #include "components/data_reduction_proxy/browser/data_reduction_proxy_params.h"
 #include "components/data_reduction_proxy/browser/data_reduction_proxy_usage_stats.h"
+#include "net/base/net_util.h"

[marq (ping after 24h), 2014/07/11 16:31:56]

Why this include and not a forward declaration of net::NetworkInterfaceList?

[bengr, 2014/07/11 22:49:16]

NetworkInterfaceList is a vector of network interfaces. I could forward declare
the typedef, but not the NetworkInterface, I think.

 #include "net/base/network_change_notifier.h"
 #include "net/url_request/url_fetcher_delegate.h"
 
@@ -211,9 +212,13 @@ class DataReductionProxySettings
   // Virtualized for mocking

[marq (ping after 24h), 2014/07/11 16:31:56]

mocking.

[bengr, 2014/07/11 22:49:16]

Done.

   virtual void RecordProbeURLFetchResult(
       data_reduction_proxy::ProbeURLFetchResult result);
+
   virtual void RecordStartupState(
       data_reduction_proxy::ProxyStartupState state);
 
+  virtual void GetNetworkList(net::NetworkInterfaceList* interfaces,

[marq (ping after 24h), 2014/07/11 16:31:56]

Needs a comment. *all* method declarations in header files need some kind of
comment (so the two declarations above this one also need them).

[bengr, 2014/07/11 22:49:16]

Done, but that's not true. I think the style is that all non trivial *public*
methods need documentation.

[marq (ping after 24h), 2014/07/11 23:51:19]

That's what I once thought, but the C++ style guide is clear on the matter, and
nothing in the Chromium style guide contradicts it. "Every function declaration
should have comments immediately preceding it that describe what the function
does and how to use it." 

[bengr, 2014/07/14 18:44:57]

Acknowledged.

+                              int policy);
+
   DataReductionProxyConfigurator* configurator() {
     return configurator_.get();
   }
@@ -273,18 +278,17 @@ class DataReductionProxySettings
   // Warms the connection to the data reduction proxy.
   void WarmProxyConnection();
 
+  // Disables use of the data reduction proxy on VPNs. Returns true if the
+  // data reduction proxy has been disabled.
+  bool DisableIfVPN();
+
   // Generic method to get a URL fetcher.
   net::URLFetcher* GetBaseURLFetcher(const GURL& gurl, int load_flags);
 
-  // Returns a UTF16 string that's the hash of the configured authentication
-  // |key| and |salt|. Returns an empty UTF16 string if no key is configured or
-  // the data reduction proxy feature isn't available.
-  static base::string16 AuthHashForSalt(int64 salt,
-                                        const std::string& key);
-
   std::string key_;
   bool restricted_by_carrier_;
   bool enabled_by_user_;
+  bool disabled_on_vpn_;
 
   scoped_ptr<net::URLFetcher> fetcher_;
   scoped_ptr<net::URLFetcher> warmup_fetcher_;