Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(731)

Unified Diff: net/url_request/url_request_unittest.h

Issue 115029: Making command-line specified proxy settings more flexible - allowing for set... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/proxy/proxy_service.cc ('k') | webkit/tools/test_shell/test_shell_request_context.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/url_request/url_request_unittest.h
===================================================================
--- net/url_request/url_request_unittest.h (revision 15852)
+++ net/url_request/url_request_unittest.h (working copy)
@@ -48,9 +48,9 @@
}
explicit TestURLRequestContext(const std::string& proxy) {
- net::ProxyInfo proxy_info;
- proxy_info.UseNamedProxy(proxy);
- proxy_service_ = net::ProxyService::Create(&proxy_info);
+ net::ProxyConfig proxy_config;
+ proxy_config.proxy_rules.ParseFromString(proxy);
+ proxy_service_ = net::ProxyService::Create(&proxy_config);
http_transaction_factory_ =
net::HttpNetworkLayer::CreateFactory(proxy_service_);
}
@@ -548,7 +548,6 @@
return true;
}
-
};
#endif // NET_URL_REQUEST_URL_REQUEST_UNITTEST_H_
« no previous file with comments | « net/proxy/proxy_service.cc ('k') | webkit/tools/test_shell/test_shell_request_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698