Store Proxy Servers as proxy servers and not GURLs.

components/data_reduction_proxy/core/browser/data_reduction_proxy_config_unittest.cc

Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_config_unittest.cc
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_unittest.cc
index 024ebd04f047923692063f65ff8eace2d74bc291..1d29bb074341cdb369367894c7c3e85efa42d711 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_unittest.cc
@@ -162,16 +162,14 @@ class DataReductionProxyConfigTest : public testing::Test {
 };
 
 TEST_F(DataReductionProxyConfigTest, TestGetDataReductionProxyOrigin) {
-  std::string result = config()->params()->origin().spec();
-  EXPECT_EQ(GURL(params()->DefaultOrigin()), GURL(result));
+  EXPECT_EQ(params()->DefaultOrigin(), config()->params()->origin().ToURI());

[bengr, 2015/02/04 00:49:26]

#include "net/proxy/proxy_server.h"

[tbansal1, 2015/02/04 22:49:10]

Done.

 }
 
 TEST_F(DataReductionProxyConfigTest, TestGetDataReductionProxyDevOrigin) {
   base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       switches::kDataReductionProxyDev, params()->DefaultDevOrigin());
   ResetSettings(true, true, false, true, false);
-  std::string result = config()->params()->origin().spec();
-  EXPECT_EQ(GURL(params()->DefaultDevOrigin()), GURL(result));
+  EXPECT_EQ(params()->DefaultDevOrigin(), config()->params()->origin().ToURI());
 }
 
 TEST_F(DataReductionProxyConfigTest, TestGetDataReductionProxies) {
@@ -181,14 +179,13 @@ TEST_F(DataReductionProxyConfigTest, TestGetDataReductionProxies) {
   unsigned int expected_proxy_size = 2u;
   EXPECT_EQ(expected_proxy_size, proxies.size());
 
-  net::HostPortPair expected_origin =
-      net::HostPortPair::FromURL(GURL(params()->DefaultOrigin()));
-  net::HostPortPair expected_fallback_origin =
-      net::HostPortPair::FromURL(GURL(params()->DefaultFallbackOrigin()));
-  EXPECT_EQ(expected_origin.host(), proxies[0].host());
-  EXPECT_EQ(expected_origin.port(), proxies[0].EffectiveIntPort());
-  EXPECT_EQ(expected_fallback_origin.host(), proxies[1].host());
-  EXPECT_EQ(expected_fallback_origin.port(), proxies[1].EffectiveIntPort());
+  EXPECT_EQ(net::ProxyServer::FromURI(params()->DefaultOrigin(),
+                                      net::ProxyServer::SCHEME_HTTP),
+            proxies[0]);
+
+  EXPECT_EQ(net::ProxyServer::FromURI(params()->DefaultFallbackOrigin(),
+                                      net::ProxyServer::SCHEME_HTTP),
+            proxies[1]);
 }
 
 TEST_F(DataReductionProxyConfigTest, TestSetProxyConfigs) {
@@ -203,16 +200,21 @@ TEST_F(DataReductionProxyConfigTest, TestSetProxyConfigs) {
 
   config()->SetProxyConfigs(true, true, false, false);
   EXPECT_TRUE(configurator()->enabled());
-  EXPECT_TRUE(
-      net::HostPortPair::FromString(params()->DefaultAltOrigin())
-          .Equals(net::HostPortPair::FromString(configurator()->origin())));
-  EXPECT_TRUE(
-      net::HostPortPair::FromString(params()->DefaultAltFallbackOrigin())
-          .Equals(net::HostPortPair::FromString(
-              configurator()->fallback_origin())));
-  EXPECT_TRUE(
-      net::HostPortPair::FromString(params()->DefaultSSLOrigin())
-          .Equals(net::HostPortPair::FromString(configurator()->ssl_origin())));
+
+  EXPECT_EQ(
+      net::ProxyServer::FromURI(params()->DefaultAltOrigin(),
+                                net::ProxyServer::SCHEME_HTTP),
+      net::ProxyServer::FromURI(configurator()->origin(),
+                                net::ProxyServer::SCHEME_HTTP));
+  EXPECT_TRUE(net::ProxyServer::FromURI(
+      params()->DefaultAltFallbackOrigin(),
+      net::ProxyServer::SCHEME_HTTP).is_valid());
+  EXPECT_EQ("", configurator()->fallback_origin());

[bengr, 2015/02/04 00:49:26]

EXPECT_TRUE(...fallback_origin().empty())

[tbansal1, 2015/02/04 22:49:10]

Done.

+  EXPECT_EQ(net::ProxyServer::FromURI(params()->DefaultSSLOrigin(),
+                                      net::ProxyServer::SCHEME_HTTP),
+          net::ProxyServer::FromURI(configurator()->ssl_origin(),

[bengr, 2015/02/04 00:49:26]

indentation

[tbansal1, 2015/02/04 22:49:10]

Done.

+                                    net::ProxyServer::SCHEME_HTTP));
+
 
   config()->SetProxyConfigs(true, false, false, false);
   EXPECT_TRUE(configurator()->enabled());