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

chrome/renderer/pepper/pepper_flash_drm_renderer_host.cc

Index: chrome/renderer/pepper/pepper_flash_drm_renderer_host.cc
diff --git a/chrome/renderer/pepper/pepper_flash_drm_renderer_host.cc b/chrome/renderer/pepper/pepper_flash_drm_renderer_host.cc
index ca59c7ef2cae40045bdfc922f155e287297617f5..e243d7020ab37d0ff3b3b67f96ce863bc1472146 100644
--- a/chrome/renderer/pepper/pepper_flash_drm_renderer_host.cc
+++ b/chrome/renderer/pepper/pepper_flash_drm_renderer_host.cc
@@ -12,7 +12,6 @@
 #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 {
 
@@ -28,7 +27,8 @@ PepperFlashDRMRendererHost::PepperFlashDRMRendererHost(
     PP_Instance instance,
     PP_Resource resource)
     : ResourceHost(host->GetPpapiHost(), instance, resource),
-      renderer_ppapi_host_(host) {
+      renderer_ppapi_host_(host),
+      weak_factory_(this) {
 }
 
 PepperFlashDRMRendererHost::~PepperFlashDRMRendererHost() {
@@ -56,13 +56,27 @@ int32_t PepperFlashDRMRendererHost::OnGetVoucherFile(
   base::FilePath voucher_file = plugin_dir.Append(
       base::FilePath(kVoucherFilename));
 
-  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;
+  IPC::Message create_msg =
+      PpapiHostMsg_FileRef_CreateExternal(voucher_file);
+  content::RendererPpapiHost::GetForPPInstance(pp_instance())->
+      CreateBrowserResourceHost(
+          pp_instance(),
+          create_msg,
+          base::Bind(&PepperFlashDRMRendererHost::DidCreateResourceHost,

[dmichael (off chromium), 2013/08/07 22:19:13]

DidCreateFileRefHost might be a clearer name, since this class is also a
resource host.

[teravest, 2013/08/08 00:50:06]

Done.

+                     weak_factory_.GetWeakPtr(),
+                     context->MakeReplyMessageContext(),
+                     voucher_file));
+  return PP_OK_COMPLETIONPENDING;
+}
+
+void PepperFlashDRMRendererHost::DidCreateResourceHost(
+    ppapi::host::ReplyMessageContext reply_context,
+    const base::FilePath& external_path,
+    int pending_resource_id) {
+  ppapi::FileRef_CreateInfo create_info =
+      ppapi::MakeExternalFileRefCreateInfo(external_path, pending_resource_id);
+  host()->SendReply(reply_context,
+                    PpapiPluginMsg_FlashDRM_GetVoucherFileReply(create_info));
 }
 
 }  // namespace chrome