Index: content/renderer/pepper/pepper_video_capture_host.cc |
diff --git a/content/renderer/pepper/pepper_video_capture_host.cc b/content/renderer/pepper/pepper_video_capture_host.cc |
index 3981785b445770c0c2cf7ec662adf4796722c3e9..d28813b338e42678cc293958814258fa5d07a606 100644 |
--- a/content/renderer/pepper/pepper_video_capture_host.cc |
+++ b/content/renderer/pepper/pepper_video_capture_host.cc |
@@ -9,7 +9,7 @@ |
#include "content/renderer/pepper/pepper_platform_video_capture.h" |
#include "content/renderer/pepper/pepper_plugin_instance_impl.h" |
#include "content/renderer/pepper/renderer_ppapi_host_impl.h" |
-#include "content/renderer/render_view_impl.h" |
+#include "content/renderer/render_frame_impl.h" |
#include "media/base/limits.h" |
#include "media/base/video_frame.h" |
#include "ppapi/host/dispatch_host_message.h" |
@@ -42,8 +42,8 @@ PepperVideoCaptureHost::PepperVideoCaptureHost(RendererPpapiHostImpl* host, |
buffer_count_hint_(0), |
status_(PP_VIDEO_CAPTURE_STATUS_STOPPED), |
enumeration_helper_(this, |
- PepperMediaDeviceManager::GetForRenderView( |
- host->GetRenderViewForInstance(pp_instance())), |
+ PepperMediaDeviceManager::GetForRenderFrame( |
+ host->GetRenderFrameForInstance(pp_instance())), |
PP_DEVICETYPE_DEV_VIDEOCAPTURE, |
host->GetDocumentURL(instance)) { |
} |
@@ -261,11 +261,12 @@ int32_t PepperVideoCaptureHost::OnOpen( |
if (!document_url.is_valid()) |
return PP_ERROR_FAILED; |
- RenderViewImpl* render_view = static_cast<RenderViewImpl*>( |
- renderer_ppapi_host_->GetRenderViewForInstance(pp_instance())); |
- |
platform_video_capture_.reset(new PepperPlatformVideoCapture( |
- render_view->AsWeakPtr(), device_id, document_url, this)); |
+ renderer_ppapi_host_->GetRenderFrameForInstance(pp_instance())-> |
+ GetRoutingID(), |
+ device_id, |
+ document_url, |
+ this)); |
open_reply_context_ = context->MakeReplyMessageContext(); |