Reland r69146...

webkit/plugins/npapi/webplugin_impl.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/plugins/npapi/webplugin_impl.h"
 
 #include "base/linked_ptr.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
@@ skipping 1160 matching lines @@
   }
 
   if (strcmp(method, "POST") == 0) {
     // Adds headers or form data to a request.  This must be called before
     // we initiate the actual request.
     SetPostData(&info.request, buf, buf_len);
   }
 
   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(WebKit::webKitClient()->createURLLoader());
+  info.loader.reset(webframe_->createAssociatedURLLoader());
   if (!info.loader.get())
     return false;
   info.loader->loadAsynchronously(info.request, this);
 
   clients_.push_back(info);
   return true;
 }
 
 void WebPluginImpl::CancelDocumentLoad() {
   if (webframe_) {
@@ skipping 180 matching lines @@
   if (!webframe_)
     return NULL;
   WebView* view = webframe_->view();
   if (!view)
     return NULL;
   return view->devToolsAgent();
 }
 
 }  // namespace npapi
 }  // namespace webkit