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

trunk/src/chrome/renderer/pepper/pepper_flash_drm_renderer_host.cc

Index: trunk/src/chrome/renderer/pepper/pepper_flash_drm_renderer_host.cc
===================================================================
--- trunk/src/chrome/renderer/pepper/pepper_flash_drm_renderer_host.cc	(revision 221543)
+++ trunk/src/chrome/renderer/pepper/pepper_flash_drm_renderer_host.cc	(working copy)
@@ -12,6 +12,7 @@
 #include "ppapi/host/host_message_context.h"
 #include "ppapi/host/ppapi_host.h"
 #include "ppapi/proxy/ppapi_messages.h"
+#include "ppapi/proxy/ppb_file_ref_proxy.h"
 
 namespace chrome {
 
@@ -27,8 +28,7 @@
     PP_Instance instance,
     PP_Resource resource)
     : ResourceHost(host->GetPpapiHost(), instance, resource),
-      renderer_ppapi_host_(host),
-      weak_factory_(this) {
+      renderer_ppapi_host_(host) {
 }
 
 PepperFlashDRMRendererHost::~PepperFlashDRMRendererHost() {
@@ -56,44 +56,14 @@
   base::FilePath voucher_file = plugin_dir.Append(
       base::FilePath(kVoucherFilename));
 
-  int renderer_pending_host_id =
-      plugin_instance->MakePendingFileRefRendererHost(voucher_file);
-  if (renderer_pending_host_id == 0)
-    return PP_ERROR_FAILED;
-
-  std::vector<IPC::Message> create_msgs;
-  create_msgs.push_back(PpapiHostMsg_FileRef_CreateExternal(voucher_file));
-
-  renderer_ppapi_host_->CreateBrowserResourceHosts(
-      pp_instance(),
-      create_msgs,
-      base::Bind(&PepperFlashDRMRendererHost::DidCreateFileRefHosts,
-                 weak_factory_.GetWeakPtr(),
-                 context->MakeReplyMessageContext(),
-                 voucher_file,
-                 renderer_pending_host_id));
-  return PP_OK_COMPLETIONPENDING;
+  ppapi::PPB_FileRef_CreateInfo create_info;
+  ppapi::proxy::PPB_FileRef_Proxy::SerializeFileRef(
+      plugin_instance->CreateExternalFileReference(voucher_file),
+      &create_info);
+  context->reply_msg =
+      PpapiPluginMsg_FlashDRM_GetVoucherFileReply(create_info);
+  return PP_OK;
 }
 
-void PepperFlashDRMRendererHost::DidCreateFileRefHosts(
-    const ppapi::host::ReplyMessageContext& reply_context,
-    const base::FilePath& external_path,
-    int renderer_pending_host_id,
-    const std::vector<int>& browser_pending_host_ids) {
-  DCHECK(browser_pending_host_ids.size() == 1);
-
-  int browser_pending_host_id = 0;
-  if (browser_pending_host_ids.size() == 1)
-    browser_pending_host_id = browser_pending_host_ids[0];
-
-  ppapi::FileRefCreateInfo create_info =
-      ppapi::MakeExternalFileRefCreateInfo(external_path,
-                                           std::string(),
-                                           browser_pending_host_id,
-                                           renderer_pending_host_id);
-  host()->SendReply(reply_context,
-                    PpapiPluginMsg_FlashDRM_GetVoucherFileReply(create_info));
-}
-
 }  // namespace chrome