Upstream version 11.39.250.0

[platform/framework/web/crosswalk.git] / src / content / renderer / pepper / pepper_media_device_manager.cc

diff --git a/src/content/renderer/pepper/pepper_media_device_manager.cc b/src/content/renderer/pepper/pepper_media_device_manager.cc
index 0d54964..676b2fb 100644 (file)
--- a/src/content/renderer/pepper/pepper_media_device_manager.cc
+++ b/src/content/renderer/pepper/pepper_media_device_manager.cc
@@ -25,13 +25,14 @@ ppapi::DeviceRefData FromStreamDeviceInfo(const StreamDeviceInfo& info) {
 
 }  // namespace
 
-PepperMediaDeviceManager* PepperMediaDeviceManager::GetForRenderFrame(
+base::WeakPtr<PepperMediaDeviceManager>
+PepperMediaDeviceManager::GetForRenderFrame(
     RenderFrame* render_frame) {
   PepperMediaDeviceManager* handler =
       PepperMediaDeviceManager::Get(render_frame);
   if (!handler)
     handler = new PepperMediaDeviceManager(render_frame);
-  return handler;
+  return handler->AsWeakPtr();
 }
 
 PepperMediaDeviceManager::PepperMediaDeviceManager(RenderFrame* render_frame)