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

Unified Diff: webkit/tools/test_shell/simple_resource_loader_bridge.cc

Issue 7791005: Stop using the default profile's proxy service for plugin proxy requests, and instead use the ass... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix test Created 9 years, 4 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 | « webkit/plugins/npapi/webplugin_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/test_shell/simple_resource_loader_bridge.cc
===================================================================
--- webkit/tools/test_shell/simple_resource_loader_bridge.cc (revision 98569)
+++ webkit/tools/test_shell/simple_resource_loader_bridge.cc (working copy)
@@ -54,7 +54,6 @@
#include "net/http/http_cache.h"
#include "net/http/http_request_headers.h"
#include "net/http/http_response_headers.h"
-#include "net/proxy/proxy_service.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_job.h"
#include "webkit/appcache/appcache_interfaces.h"
@@ -792,25 +791,6 @@
return new ResourceLoaderBridgeImpl(request_info);
}
-// Issue the proxy resolve request on the io thread, and wait
-// for the result.
-bool FindProxyForUrl(const GURL& url, std::string* proxy_list) {
- DCHECK(g_request_context);
-
- scoped_refptr<net::SyncProxyServiceHelper> sync_proxy_service(
- new net::SyncProxyServiceHelper(g_io_thread->message_loop(),
- g_request_context->proxy_service()));
-
- net::ProxyInfo proxy_info;
- int rv = sync_proxy_service->ResolveProxy(url, &proxy_info,
- net::BoundNetLog());
- if (rv == net::OK) {
- *proxy_list = proxy_info.ToPacString();
- }
-
- return rv == net::OK;
-}
-
} // namespace webkit_glue
//-----------------------------------------------------------------------------
« no previous file with comments | « webkit/plugins/npapi/webplugin_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698