Bypass data reduction proxy when using VPN

components/data_reduction_proxy/browser/data_reduction_proxy_settings.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_SETTINGS_H_
 #define COMPONENTS_DATA_REDUCTION_PROXY_BROWSER_DATA_REDUCTION_PROXY_SETTINGS_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_member.h"
 #include "base/threading/thread_checker.h"
 #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"
 
 class PrefService;
 
 namespace net {
 class HostPortPair;
 class HttpNetworkSession;
 class HttpResponseHeaders;
 class URLFetcher;
@@ skipping 172 matching lines @@
   // Metrics method. Subclasses should override if they wish to provide
   // alternatives.
   virtual void RecordDataReductionInit();
 
   virtual void AddDefaultProxyBypassRules();
 
   // Writes a warning to the log that is used in backend processing of
   // customer feedback. Virtual so tests can mock it for verification.
   virtual void LogProxyState(bool enabled, bool restricted, bool at_startup);
 
   // 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();
   }
 
   // Reset params for tests.
   void ResetParamsForTest(DataReductionProxyParams* params);
 
  private:
   friend class DataReductionProxySettingsTestBase;
   friend class DataReductionProxySettingsTest;
@@ skipping 39 matching lines @@
   void MaybeActivateDataReductionProxy(bool at_startup);
 
   // Requests the proxy probe URL, if one is set.  If unable to do so, disables
   // the proxy, if enabled. Otherwise enables the proxy if disabled by a probe
   // failure.
   void ProbeWhetherDataReductionProxyIsAvailable();
 
   // 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_;
 
   BooleanPrefMember spdy_proxy_auth_enabled_;
   BooleanPrefMember data_reduction_proxy_alternative_enabled_;
 
   PrefService* prefs_;
   PrefService* local_state_prefs_;
 
   net::URLRequestContextGetter* url_request_context_getter_;
 
   scoped_ptr<DataReductionProxyConfigurator> configurator_;
 
   base::ThreadChecker thread_checker_;
 
   scoped_ptr<DataReductionProxyParams> params_;
   DataReductionProxyUsageStats* usage_stats_;
 
   DISALLOW_COPY_AND_ASSIGN(DataReductionProxySettings);
 };
 
 }  // namespace data_reduction_proxy
 
 #endif  // COMPONENTS_DATA_REDUCTION_PROXY_BROWSER_DATA_REDUCTION_PROXY_SETTINGS_H_