Handle disabling data reduction proxy for all platforms.

chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.cc

 // 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.
 
 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/sequenced_task_runner.h"
 #include "base/strings/string_util.h"
@@ skipping 49 matching lines @@
 
   std::string trimmed_ssl;
   base::TrimString(ssl_origin, "/", &trimmed_ssl);
 
   std::string server = "http=" + JoinString(proxies, ",") + ",direct://;"
       + (ssl_origin.empty() ? "" : ("https=" + trimmed_ssl + ",direct://;"));
 
   dict->SetString("server", server);
   dict->SetString("mode", ProxyModeToString(ProxyPrefs::MODE_FIXED_SERVERS));
   dict->SetString("bypass_list", JoinString(bypass_rules_, ", "));
+  dict->SetBoolean("is_data_reduction_proxy", true);

[bengr, 2014/10/27 23:28:01]

How about "use_with_off_the_record", false

[Not at Google. Contact bengr, 2014/10/28 19:51:03]

Discussed in person. Odd to use a label which is not specific to this file.

 
   net::ProxyConfig config;
   config.proxy_rules().ParseFromString(server);
   config.proxy_rules().bypass_rules.ParseFromString(
       JoinString(bypass_rules_, ", "));
   // The ID is set to a bogus value. It cannot be left uninitialized, else the
   // config will return invalid.
   net::ProxyConfig::ID unused_id = 1;
   config.set_id(unused_id);
   network_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(
           &DataReductionProxyChromeConfigurator::UpdateProxyConfigOnIO,
           base::Unretained(this),
           config));
 }
 
 void DataReductionProxyChromeConfigurator::Disable() {
   DCHECK(prefs_);
-  DictionaryPrefUpdate update(prefs_, prefs::kProxy);
-  base::DictionaryValue* dict = update.Get();
-  dict->SetString("mode", ProxyModeToString(ProxyPrefs::MODE_SYSTEM));
-  dict->SetString("server", "");
-  dict->SetString("bypass_list", "");
-  net::ProxyConfig config = net::ProxyConfig::CreateDirect();
-  network_task_runner_->PostTask(
-      FROM_HERE,
-      base::Bind(
-          &DataReductionProxyChromeConfigurator::UpdateProxyConfigOnIO,
-          base::Unretained(this),
-          config));
+    DictionaryPrefUpdate update(prefs_, prefs::kProxy);
+    base::DictionaryValue* dict = update.Get();
+    bool is_data_reduction_proxy = false;
+    dict->GetBoolean("is_data_reduction_proxy", &is_data_reduction_proxy);

[bengr, 2014/10/27 23:28:01]

Please verify (and add a test) that this will get erased if the user specifies a
proxy. 

[Not at Google. Contact bengr, 2014/10/28 19:51:03]

This approach does not work since the dictionary does not necessarily reset when
user prefs are set. Switched to using params directly. Added test. Unable to
test manually on linux.

+    if (is_data_reduction_proxy) {

[bengr, 2014/10/27 23:28:01]

if (!is_data_reduction_proxy)
  return;

[Not at Google. Contact bengr, 2014/10/28 19:51:03]

Done.

+      dict->SetString("mode", ProxyModeToString(ProxyPrefs::MODE_SYSTEM));
+      dict->SetString("server", "");
+      dict->SetString("bypass_list", "");
+      dict->SetBoolean("is_data_reduction_proxy", false);
+      net::ProxyConfig config = net::ProxyConfig::CreateDirect();
+      network_task_runner_->PostTask(
+          FROM_HERE,
+          base::Bind(
+              &DataReductionProxyChromeConfigurator::UpdateProxyConfigOnIO,
+              base::Unretained(this),
+              config));
+    }
 }
 
 void DataReductionProxyChromeConfigurator::AddHostPatternToBypass(
     const std::string& pattern) {
   bypass_rules_.push_back(pattern);
 }
 
 void DataReductionProxyChromeConfigurator::AddURLPatternToBypass(
     const std::string& pattern) {
   size_t pos = pattern.find('/');
@@ skipping 11 matching lines @@
 
 void DataReductionProxyChromeConfigurator::UpdateProxyConfigOnIO(
     const net::ProxyConfig& config) {
   config_ = config;
 }
 
 const net::ProxyConfig&
 DataReductionProxyChromeConfigurator::GetProxyConfigOnIO() const {
   return config_;
 }