summaryrefslogtreecommitdiffstats
path: root/chrome/browser/renderer_host/resource_dispatcher_host.cc
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-16 21:12:23 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-16 21:12:23 +0000
commit7918c5068f2be01058e582077bec0b4aa221979a (patch)
treeb701bc9134b810128d574aad52e41b9449a17b72 /chrome/browser/renderer_host/resource_dispatcher_host.cc
parentc6d474f8e04b08306349ea514d529b8f25ffd4b2 (diff)
downloadchromium_src-7918c5068f2be01058e582077bec0b4aa221979a.zip
chromium_src-7918c5068f2be01058e582077bec0b4aa221979a.tar.gz
chromium_src-7918c5068f2be01058e582077bec0b4aa221979a.tar.bz2
Tommi, please review everything. jam please review changes to resource_dispatcher_host.cc
XMLHttpRequests issued by ChromeFrame instances would not use the host network stack at times. HTTP requests issued by these chrome instances are sent over automation to the host browser. This relies on the request having a renderer process id and a routing id for us to be able to intercept these requests. XHR requests are sent over to the browser via the ViewHostMsg_SyncLoad. This message has the routing id. However we always passed 0 down to the ResourceDispatcherHost::BeginRequest function which caused this to fail. Added a chrome frame specific unit test for this. Fixes bug http://code.google.com/p/chromium/issues/detail?id=30355 Bug=30355 Review URL: http://codereview.chromium.org/501040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34750 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host/resource_dispatcher_host.cc')
-rw-r--r--chrome/browser/renderer_host/resource_dispatcher_host.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.cc b/chrome/browser/renderer_host/resource_dispatcher_host.cc
index 657e495..78656b2 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host.cc
@@ -383,7 +383,8 @@ void ResourceDispatcherHost::OnSyncLoad(
int request_id,
const ViewHostMsg_Resource_Request& request_data,
IPC::Message* sync_result) {
- BeginRequest(request_id, request_data, sync_result, 0);
+ BeginRequest(request_id, request_data, sync_result,
+ sync_result->routing_id());
}
void ResourceDispatcherHost::BeginRequest(