ProxyConfig behaved like a struct, but was defined as a class.

Changed it to be a proper class with hidden implementation variables, setters etc.

Also seized this opportunity to move the bypass list from being a member of ProxyConfig, to being a member of ProxyRules. This is a more correct hiearchy, since the bypass rules only apply to the manual settings. Lastly, this makes it possible to have the manual rules evaluation be a method on ProxyRules, and shift some more code out of proxy_service.
Review URL: http://codereview.chromium.org/651070

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39818 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 13 deletions

diff --git a/net/spdy/spdy_network_transaction_unittest.cc b/net/spdy/spdy_network_transaction_unittest.cc
index 888685a..31847ef 100644
--- a/net/spdy/spdy_network_transaction_unittest.cc
+++ b/net/spdy/spdy_network_transaction_unittest.cc
@@ -26,11 +26,6 @@ namespace net {
 
 namespace {
 
-// Create a proxy service which fails on all requests (falls back to direct).
-ProxyService* CreateNullProxyService() {
-  return ProxyService::CreateNull();
-}
-
 // Helper to manage the lifetimes of the dependencies for a
 // SpdyNetworkTransaction.
 class SessionDependencies {
@@ -38,7 +33,7 @@ class SessionDependencies {
   // Default set of dependencies -- "null" proxy service.
   SessionDependencies()
       : host_resolver(new MockHostResolver),
-        proxy_service(CreateNullProxyService()),
+        proxy_service(ProxyService::CreateNull()),
         ssl_config_service(new SSLConfigServiceDefaults),
         http_auth_handler_factory(HttpAuthHandlerFactory::CreateDefault()),
         spdy_session_pool(new SpdySessionPool) {
@@ -67,13 +62,6 @@ class SessionDependencies {
   scoped_refptr<SpdySessionPool> spdy_session_pool;
 };
 
-ProxyService* CreateFixedProxyService(const std::string& proxy) {
-  ProxyConfig proxy_config;
-  proxy_config.proxy_rules.ParseFromString(proxy);
-  return ProxyService::CreateFixed(proxy_config);
-}
-
-
 HttpNetworkSession* CreateSession(SessionDependencies* session_deps) {
   return new HttpNetworkSession(NULL,
                                 session_deps->host_resolver,