Revert r69146 due to webkit layout test failures.

TBR=pfeldman

Review URL: http://codereview.chromium.org/5814002

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

2 files changed, 19 insertions, 2 deletions

diff --git a/webkit/glue/plugins/pepper_url_loader.cc b/webkit/glue/plugins/pepper_url_loader.cc
index bd8cca0..83da95f 100644
--- a/webkit/glue/plugins/pepper_url_loader.cc
+++ b/webkit/glue/plugins/pepper_url_loader.cc
@@ -236,7 +236,15 @@ int32_t URLLoader::Open(URLRequestInfo* request,
   if (rv != PP_OK)
     return rv;
 
-  loader_.reset(frame->createAssociatedURLLoader());
+  frame->dispatchWillSendRequest(web_request);
+
+  // Sets the appcache host id to allow retrieval from the appcache.
+  if (WebApplicationCacheHostImpl* appcache_host =
+          WebApplicationCacheHostImpl::FromFrame(frame)) {
+    appcache_host->willStartSubResourceRequest(web_request);
+  }
+
+  loader_.reset(WebKit::webKitClient()->createURLLoader());
   if (!loader_.get())
     return PP_ERROR_FAILED;
 
diff --git a/webkit/glue/plugins/webplugin_impl.cc b/webkit/glue/plugins/webplugin_impl.cc
index f6ef803..3891563 100644
--- a/webkit/glue/plugins/webplugin_impl.cc
+++ b/webkit/glue/plugins/webplugin_impl.cc
@@ -1168,13 +1168,22 @@ bool WebPluginImpl::InitiateHTTPRequest(unsigned long resource_id,
 
   SetReferrer(&info.request, referrer_flag);
 
+  // Sets the routing id to associate the ResourceRequest with the RenderView.
+  webframe_->dispatchWillSendRequest(info.request);
+
+  // Sets the appcache host id to allow retrieval from the appcache.
+  if (WebApplicationCacheHostImpl* appcache_host =
+          WebApplicationCacheHostImpl::FromFrame(webframe_)) {
+    appcache_host->willStartSubResourceRequest(info.request);
+  }
+
   if (WebDevToolsAgent* devtools_agent = GetDevToolsAgent()) {
     devtools_agent->identifierForInitialRequest(resource_id, webframe_,
                                                 info.request);
     devtools_agent->willSendRequest(resource_id, info.request);
   }
 
-  info.loader.reset(webframe_->createAssociatedURLLoader());
+  info.loader.reset(WebKit::webKitClient()->createURLLoader());
   if (!info.loader.get())
     return false;
   info.loader->loadAsynchronously(info.request, this);