Use data reduction proxy when managed proxy config returns direct

chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.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 CHROME_BROWSER_NET_SPDYPROXY_DATA_REDUCTION_PROXY_CHROME_CONFIGURATOR_H_
 #define CHROME_BROWSER_NET_SPDYPROXY_DATA_REDUCTION_PROXY_CHROME_CONFIGURATOR_H_
 
 #include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
+#include "base/task_runner.h"
 #include "components/data_reduction_proxy/browser/data_reduction_proxy_configurator.h"
+#include "net/proxy/proxy_config.h"
+
+namespace base {
+class SequencedTaskRunner;
+}
+
+namespace net {
+class ProxyInfo;
+class ProxyService;
+}
 
 class PrefService;
 
 class DataReductionProxyChromeConfigurator
     : public data_reduction_proxy::DataReductionProxyConfigurator {
  public:
-  explicit DataReductionProxyChromeConfigurator(PrefService* prefs);
+  explicit DataReductionProxyChromeConfigurator(
+      PrefService* prefs,
+      scoped_refptr<base::SequencedTaskRunner> network_task_runner);
   virtual ~DataReductionProxyChromeConfigurator();
 
   virtual void Enable(bool primary_restricted,
                       bool fallback_restricted,
                       const std::string& primary_origin,
                       const std::string& fallback_origin,
                       const std::string& ssl_origin) OVERRIDE;
   virtual void Disable() OVERRIDE;
 
   // Add a host pattern to bypass. This should follow the same syntax used
   // in net::ProxyBypassRules; that is, a hostname pattern, a hostname suffix
   // pattern, an IP literal, a CIDR block, or the magic string '<local>'.
   // Bypass settings persist for the life of this object and are applied
   // each time the proxy is enabled, but are not updated while it is enabled.
   virtual void AddHostPatternToBypass(const std::string& pattern) OVERRIDE;
 
   // Add a URL pattern to bypass the proxy. The base implementation strips
   // everything in |pattern| after the first single slash and then treats it
   // as a hostname pattern. Subclasses may implement other semantics.
   virtual void AddURLPatternToBypass(const std::string& pattern) OVERRIDE;
 
+  // Updates the config for use on the IO thread.
+  void UpdateProxyConfigOnIO(const net::ProxyConfig& config);
+
+  // Returns the current data reduction proxy config, even if it is not the
+  // effective configuration used by the proxy service. Note the ID of the

[mef, 2014/08/12 17:56:35]

I think this comment is wrong (starting with "Note the ID...").

[bengr, 2014/08/12 20:09:39]

I think it is correct.

ProxyConfig::ProxyConfig()
    : auto_detect_(false), pac_mandatory_(false),
      source_(PROXY_CONFIG_SOURCE_UNKNOWN), id_(kInvalidConfigID)  {
}

bool is_valid() const { return id_ != kInvalidConfigID; }

[bengr, 2014/08/13 01:31:27]

Done.

+  // proxy config is set to a bogus value. It cannot be left uninitialized,
+  // else the config will return invalid.
+  const net::ProxyConfig& GetProxyConfigOnIO() const;
+
  private:
   FRIEND_TEST_ALL_PREFIXES(DataReductionProxyConfigTest, TestBypassList);
 
   PrefService* prefs_;
+  scoped_refptr<base::SequencedTaskRunner> network_task_runner_;
+
   std::vector<std::string> bypass_rules_;
+  net::ProxyConfig config_;
 
   DISALLOW_COPY_AND_ASSIGN(DataReductionProxyChromeConfigurator);
 };
 
 #endif  // CHROME_BROWSER_NET_SPDYPROXY_DATA_REDUCTION_PROXY_CHROME_CONFIGURATOR_H_