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

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

Issue 14142: Start using the proxy resolve IPC for plugins.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 11 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/glue/webkit_glue.h ('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 8931)
+++ webkit/tools/test_shell/simple_resource_loader_bridge.cc (working copy)
@@ -40,6 +40,7 @@
#include "net/base/io_buffer.h"
#include "net/base/net_util.h"
#include "net/base/upload_data.h"
+#include "net/proxy/proxy_service.h"
#include "net/url_request/url_request.h"
#include "webkit/glue/resource_loader_bridge.h"
#include "webkit/tools/test_shell/test_shell_request_context.h"
@@ -526,6 +527,24 @@
return getter->GetResult();
}
+// Issue the proxy resolve request on the io thread, and wait
+// for the result.
+bool FindProxyForUrl(const GURL& url, std::string* proxy_list) {
+ DCHECK(request_context);
+
+ scoped_refptr<net::SyncProxyServiceHelper> sync_proxy_service(
+ new net::SyncProxyServiceHelper(io_thread->message_loop(),
+ request_context->proxy_service()));
+
+ net::ProxyInfo proxy_info;
+ int rv = sync_proxy_service->ResolveProxy(url, &proxy_info);
+ if (rv == net::OK) {
+ *proxy_list = proxy_info.GetAnnotatedProxyList();
+ }
+
+ return rv == net::OK;
+}
+
} // namespace webkit_glue
//-----------------------------------------------------------------------------
« no previous file with comments | « webkit/glue/webkit_glue.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698