Reland r69146...

webkit/plugins/ppapi/ppb_url_loader_impl.cc

 // Copyright (c) 2011 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/ppapi/ppb_url_loader_impl.h"
 
 #include "base/logging.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_url_loader.h"
@@ skipping 231 matching lines @@
 
   WebFrame* frame = GetFrame(instance_);
   if (!frame)
     return PP_ERROR_FAILED;
   WebURLRequest web_request(request->ToWebURLRequest(frame));
 
   rv = CanRequest(frame, web_request.url());
   if (rv != PP_OK)
     return rv;
 
-  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());
+  loader_.reset(frame->createAssociatedURLLoader());
   if (!loader_.get())
     return PP_ERROR_FAILED;
 
   loader_->loadAsynchronously(web_request, this);
 
   request_info_ = scoped_refptr<PPB_URLRequestInfo_Impl>(request);
 
   // Notify completion when we receive a redirect or response headers.
   RegisterCallback(callback);
   return PP_ERROR_WOULDBLOCK;
@@ skipping 301 matching lines @@
   return request_info_ && request_info_->record_download_progress();
 }
 
 bool PPB_URLLoader_Impl::RecordUploadProgress() const {
   return request_info_ && request_info_->record_upload_progress();
 }
 
 }  // namespace ppapi
 }  // namespace webkit