Revert 218305 "Pepper: Move FileRef to the "new" resource proxy."

trunk/src/content/renderer/pepper/pepper_url_loader_host.cc

 // Copyright (c) 2013 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 "content/renderer/pepper/pepper_url_loader_host.h"
 
 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
 #include "content/renderer/pepper/renderer_ppapi_host_impl.h"
 #include "content/renderer/pepper/url_request_info_util.h"
 #include "content/renderer/pepper/url_response_info_util.h"
@@ skipping 232 matching lines @@
     return PP_ERROR_NOACCESS;
   }
 
   if (loader_.get())
     return PP_ERROR_INPROGRESS;
 
   WebFrame* frame = GetFrame();
   if (!frame)
     return PP_ERROR_FAILED;
   WebURLRequest web_request;
-  if (!CreateWebURLRequest(pp_instance(),
-                           &filled_in_request_data,
-                           frame,
-                           &web_request)) {
+  if (!CreateWebURLRequest(&filled_in_request_data, frame, &web_request))
     return PP_ERROR_FAILED;
-  }
   web_request.setRequestorProcessID(renderer_ppapi_host_->GetPluginPID());
 
   WebURLLoaderOptions options;
   if (has_universal_access_) {
     options.allowCredentials = true;
     options.crossOriginRequestPolicy =
         WebURLLoaderOptions::CrossOriginRequestPolicyAllow;
   } else {
     // All other HTTP requests are untrusted.
     options.untrustedHTTP = true;
@@ skipping 117 matching lines @@
   // up-front should be valid (plugin document loads happen after all
   // redirects are processed since WebKit has to know the MIME type).
   if (!main_document_loader_) {
     // We note when there's a callback in flight for a response to ensure that
     // messages we send to the plugin are not sent out of order. See
     // SendUpdateToPlugin() for more details.
     DCHECK(!pending_response_);
     pending_response_ = true;
 
     DataFromWebURLResponse(
-        renderer_ppapi_host_,
         pp_instance(),
         response,
         base::Bind(&PepperURLLoaderHost::DidDataFromWebURLResponse,
             weak_factory_.GetWeakPtr()));
   }
 }
 
 void PepperURLLoaderHost::DidDataFromWebURLResponse(
     const ppapi::URLResponseInfoData& data) {
   SendUpdateToPlugin(new PpapiPluginMsg_URLLoader_ReceivedResponse(data));
@@ skipping 11 matching lines @@
     ppapi::proxy::ResourceMessageReplyParams params;
     SendUpdateToPlugin(new PpapiPluginMsg_URLLoader_UpdateProgress(
             record_upload ? bytes_sent_ : -1,
             record_upload ? total_bytes_to_be_sent_ : -1,
             record_download ? bytes_received_ : -1,
             record_download ? total_bytes_to_be_received_ : -1));
   }
 }
 
 }  // namespace content