Index: content/renderer/pepper/pepper_media_device_manager.cc |
diff --git a/content/renderer/pepper/pepper_media_device_manager.cc b/content/renderer/pepper/pepper_media_device_manager.cc |
index 0d54964ebc43be717448af96ad6ff693228c3522..676b2fb44b931b0da3b0f01a89dc5404953cafe6 100644 |
--- a/content/renderer/pepper/pepper_media_device_manager.cc |
+++ b/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) |