Added command line flag to override list of proxies from Data Saver API

components/data_reduction_proxy/core/browser/data_reduction_proxy_mutable_config_values_unittest.cc

Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_mutable_config_values_unittest.cc
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_mutable_config_values_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_mutable_config_values_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..f24144e024ea5870a2ac39b9084ff5a5879dce37
--- /dev/null
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_mutable_config_values_unittest.cc
@@ -0,0 +1,93 @@
+// Copyright 2015 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 "components/data_reduction_proxy/core/browser/data_reduction_proxy_mutable_config_values.h"
+
+#include <vector>
+
+#include "base/command_line.h"
+#include "base/memory/scoped_ptr.h"
+#include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"
+#include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h"
+#include "net/proxy/proxy_server.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace data_reduction_proxy {
+
+namespace {
+
+class DataReductionProxyMutableConfigValuesTest : public testing::Test {
+ public:
+  DataReductionProxyMutableConfigValuesTest() {}
+  ~DataReductionProxyMutableConfigValuesTest() override {}
+
+  void Init() {
+    params_.reset(new DataReductionProxyParams(
+        DataReductionProxyParams::kAllowAllProxyConfigurations));
+    mutable_config_values_ =
+        DataReductionProxyMutableConfigValues::CreateFromParams(params_.get());
+  }
+
+  DataReductionProxyMutableConfigValues* mutable_config_values() const {
+    return mutable_config_values_.get();
+  }
+
+ private:
+  scoped_ptr<DataReductionProxyParams> params_;
+  scoped_ptr<DataReductionProxyMutableConfigValues> mutable_config_values_;
+};
+
+TEST_F(DataReductionProxyMutableConfigValuesTest, UpdateValuesAndInvalidate) {
+  Init();
+  EXPECT_EQ(std::vector<net::ProxyServer>(),
+            mutable_config_values()->proxies_for_http());
+
+  std::vector<net::ProxyServer> proxies_for_http;
+  proxies_for_http.push_back(net::ProxyServer::FromURI(
+      "http://first.net", net::ProxyServer::SCHEME_HTTP));
+  proxies_for_http.push_back(net::ProxyServer::FromURI(
+      "http://second.net", net::ProxyServer::SCHEME_HTTP));
+
+  mutable_config_values()->UpdateValues(proxies_for_http);
+  EXPECT_EQ(proxies_for_http, mutable_config_values()->proxies_for_http());
+
+  mutable_config_values()->Invalidate();
+  EXPECT_EQ(std::vector<net::ProxyServer>(),
+            mutable_config_values()->proxies_for_http());
+}
+
+TEST_F(DataReductionProxyMutableConfigValuesTest, OverrideProxiesForHttp) {
+  base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+      switches::kDataReductionProxyConfigHttpProxiesOverride,

[bengr, 2015/09/17 17:27:34]

Somewhere you should document that this is a semicolon-separated list of proxies
with scheme, host, and port, and without a trailing slash. Also, internally,
HTTP proxies don't need the scheme. Is the scheme required here?

[sclittle, 2015/09/22 19:01:59]

Documented in switches.cc.

The scheme isn't required here (it will default to HTTP), and it's OK to have a
trailing slash.

+      "http://override-first.net;http://override-second.net");
+  Init();
+
+  EXPECT_EQ(std::vector<net::ProxyServer>(),
+            mutable_config_values()->proxies_for_http());
+
+  std::vector<net::ProxyServer> proxies_for_http;
+  proxies_for_http.push_back(net::ProxyServer::FromURI(
+      "http://first.net", net::ProxyServer::SCHEME_HTTP));
+  proxies_for_http.push_back(net::ProxyServer::FromURI(
+      "http://second.net", net::ProxyServer::SCHEME_HTTP));
+
+  mutable_config_values()->UpdateValues(proxies_for_http);
+
+  std::vector<net::ProxyServer> expected_override_proxies_for_http;
+  expected_override_proxies_for_http.push_back(net::ProxyServer::FromURI(
+      "http://override-first.net", net::ProxyServer::SCHEME_HTTP));
+  expected_override_proxies_for_http.push_back(net::ProxyServer::FromURI(
+      "http://override-second.net", net::ProxyServer::SCHEME_HTTP));
+
+  EXPECT_EQ(expected_override_proxies_for_http,
+            mutable_config_values()->proxies_for_http());
+
+  mutable_config_values()->Invalidate();
+  EXPECT_EQ(std::vector<net::ProxyServer>(),
+            mutable_config_values()->proxies_for_http());
+}
+
+}  // namespace
+
+}  // namespace data_reduction_proxy