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

chrome/renderer/pepper/pepper_flash_drm_renderer_host.cc

 // Copyright (c) 2012 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 "chrome/renderer/pepper/pepper_flash_drm_renderer_host.h"
 
 #include "base/files/file_path.h"
 #include "content/public/renderer/pepper_plugin_instance.h"
 #include "content/public/renderer/renderer_ppapi_host.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/host/dispatch_host_message.h"
 #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 {
 
 // TODO(raymes): This is duplicated from pepper_flash_drm_host.cc but once
 // FileRef is refactored to the browser, it won't need to be.
 namespace {
 const base::FilePath::CharType kVoucherFilename[] =
     FILE_PATH_LITERAL("plugin.vch");
 }  // namespace
 
 PepperFlashDRMRendererHost::PepperFlashDRMRendererHost(
     content::RendererPpapiHost* host,
     PP_Instance instance,
     PP_Resource resource)
     : ResourceHost(host->GetPpapiHost(), instance, resource),
-      renderer_ppapi_host_(host) {
+      renderer_ppapi_host_(host),
+      weak_factory_(this) {
 }
 
 PepperFlashDRMRendererHost::~PepperFlashDRMRendererHost() {
 }
 
 int32_t PepperFlashDRMRendererHost::OnResourceMessageReceived(
     const IPC::Message& msg,
     ppapi::host::HostMessageContext* context) {
   IPC_BEGIN_MESSAGE_MAP(PepperFlashDRMRendererHost, msg)
     PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(PpapiHostMsg_FlashDRM_GetVoucherFile,
                                         OnGetVoucherFile)
   IPC_END_MESSAGE_MAP()
   return PP_ERROR_FAILED;
 }
 
 int32_t PepperFlashDRMRendererHost::OnGetVoucherFile(
     ppapi::host::HostMessageContext* context) {
   content::PepperPluginInstance* plugin_instance =
       renderer_ppapi_host_->GetPluginInstance(pp_instance());
   if (!plugin_instance)
     return PP_ERROR_FAILED;
 
   base::FilePath plugin_dir = plugin_instance->GetModulePath().DirName();
   DCHECK(!plugin_dir.empty());
   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