Store Proxy Servers as proxy servers and not GURLs.

components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor_unittest.cc

Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor_unittest.cc
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor_unittest.cc
index 26de12c3044d10d489dec033508ae65eea8865db..d496577b33148e6238cffa57792d9b779e3a98f9 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor_unittest.cc
@@ -83,7 +83,7 @@ class TestURLRequestContextWithDataReductionProxy
   TestURLRequestContextWithDataReductionProxy(DataReductionProxyParams* params,
                                               net::NetworkDelegate* delegate)
       : net::TestURLRequestContext(true) {
-    std::string proxy = params->origin().spec();
+    std::string proxy = params->origin().ToURI();

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

#include <string>

#include "net/proxy/proxy_server.h"

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

Done.

     context_storage_.set_proxy_service(net::ProxyService::CreateFixed(proxy));
     set_network_delegate(delegate);
   }
@@ -187,9 +187,11 @@ class DataReductionProxyInterceptorWithServerTest : public testing::Test {
         TestDataReductionProxyParams::HAS_EVERYTHING &
             ~TestDataReductionProxyParams::HAS_DEV_ORIGIN &
             ~TestDataReductionProxyParams::HAS_DEV_FALLBACK_ORIGIN));
-    params->set_origin(proxy_.GetURL("/"));
-    std::string proxy_name =
-        net::HostPortPair::FromURL(GURL(params->origin())).ToString();
+    std::string spec = proxy_.GetURL("/").spec();

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

This seems wrong, but I'm not sure what you're trying to do here. Why won't
ToURI() do what you need?

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

proxy_ is EmbeddedTestServer. So, I have to call GetURL() on it to obtain a
GURL. Also, to convert GURL to something that ProxyServer understands, I have to
remove the trailing slash.

[bengr, 2015/02/05 00:31:07]

Use base::TrimString

[tbansal1, 2015/02/05 01:54:09]

Done.

+    params->set_origin(net::ProxyServer::FromURI(
+        spec.substr(0, spec.length()-1),
+        net::ProxyServer::SCHEME_HTTP));
+    std::string proxy_name = params->origin().ToURI();
     proxy_service_.reset(
         net::ProxyService::CreateFixedFromPacResult(
             "PROXY " + proxy_name + "; DIRECT"));