| Index: chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc
|
| diff --git a/chrome/browser/renderer_host/pepper/pepper_flash_device_id_host.cc b/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc
|
| similarity index 63%
|
| copy from chrome/browser/renderer_host/pepper/pepper_flash_device_id_host.cc
|
| copy to chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc
|
| index 667fd4a85195fa88375f4860fe961b60ff09198a..efc493d1229e576f11ac824625cacc006eef74bc 100644
|
| --- a/chrome/browser/renderer_host/pepper/pepper_flash_device_id_host.cc
|
| +++ b/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chrome/browser/renderer_host/pepper/pepper_flash_device_id_host.h"
|
| +#include "chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h"
|
|
|
| #include "base/bind.h"
|
| #include "base/compiler_specific.h"
|
| @@ -18,9 +18,9 @@ using content::BrowserPpapiHost;
|
|
|
| namespace chrome {
|
|
|
| -PepperFlashDeviceIDHost::PepperFlashDeviceIDHost(BrowserPpapiHost* host,
|
| - PP_Instance instance,
|
| - PP_Resource resource)
|
| +PepperFlashDRMHost::PepperFlashDRMHost(BrowserPpapiHost* host,
|
| + PP_Instance instance,
|
| + PP_Resource resource)
|
| : ppapi::host::ResourceHost(host->GetPpapiHost(), instance, resource),
|
| weak_factory_(this){
|
| int render_process_id, unused;
|
| @@ -28,22 +28,22 @@ PepperFlashDeviceIDHost::PepperFlashDeviceIDHost(BrowserPpapiHost* host,
|
| fetcher_ = new DeviceIDFetcher(render_process_id);
|
| }
|
|
|
| -PepperFlashDeviceIDHost::~PepperFlashDeviceIDHost() {
|
| +PepperFlashDRMHost::~PepperFlashDRMHost() {
|
| }
|
|
|
| -int32_t PepperFlashDeviceIDHost::OnResourceMessageReceived(
|
| +int32_t PepperFlashDRMHost::OnResourceMessageReceived(
|
| const IPC::Message& msg,
|
| ppapi::host::HostMessageContext* context) {
|
| - IPC_BEGIN_MESSAGE_MAP(PepperFlashDeviceIDHost, msg)
|
| - PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(PpapiHostMsg_FlashDeviceID_GetDeviceID,
|
| + IPC_BEGIN_MESSAGE_MAP(PepperFlashDRMHost, msg)
|
| + PPAPI_DISPATCH_HOST_RESOURCE_CALL_0(PpapiHostMsg_FlashDRM_GetDeviceID,
|
| OnHostMsgGetDeviceID)
|
| IPC_END_MESSAGE_MAP()
|
| return PP_ERROR_FAILED;
|
| }
|
|
|
| -int32_t PepperFlashDeviceIDHost::OnHostMsgGetDeviceID(
|
| - const ppapi::host::HostMessageContext* context) {
|
| - if (!fetcher_->Start(base::Bind(&PepperFlashDeviceIDHost::GotDeviceID,
|
| +int32_t PepperFlashDRMHost::OnHostMsgGetDeviceID(
|
| + ppapi::host::HostMessageContext* context) {
|
| + if (!fetcher_->Start(base::Bind(&PepperFlashDRMHost::GotDeviceID,
|
| weak_factory_.GetWeakPtr(),
|
| context->MakeReplyMessageContext()))) {
|
| return PP_ERROR_INPROGRESS;
|
| @@ -51,13 +51,13 @@ int32_t PepperFlashDeviceIDHost::OnHostMsgGetDeviceID(
|
| return PP_OK_COMPLETIONPENDING;
|
| }
|
|
|
| -void PepperFlashDeviceIDHost::GotDeviceID(
|
| +void PepperFlashDRMHost::GotDeviceID(
|
| ppapi::host::ReplyMessageContext reply_context,
|
| const std::string& id) {
|
| reply_context.params.set_result(
|
| id.empty() ? PP_ERROR_FAILED : PP_OK);
|
| host()->SendReply(reply_context,
|
| - PpapiPluginMsg_FlashDeviceID_GetDeviceIDReply(id));
|
| + PpapiPluginMsg_FlashDRM_GetDeviceIDReply(id));
|
| }
|
|
|
| } // namespace chrome
|
|
|