Index: content/renderer/media/media_stream_impl.cc |
diff --git a/content/renderer/media/media_stream_impl.cc b/content/renderer/media/media_stream_impl.cc |
index 49404339748fb18cfbc84c9533155c84a84b19af..c2be81dddc4339b68f643308a8dbc042a8b9b419 100644 |
--- a/content/renderer/media/media_stream_impl.cc |
+++ b/content/renderer/media/media_stream_impl.cc |
@@ -73,11 +73,13 @@ static std::string ExtractManagerStreamLabel( |
int MediaStreamImpl::next_request_id_ = 0; |
MediaStreamImpl::MediaStreamImpl( |
+ content::RenderView* render_view, |
MediaStreamDispatcher* media_stream_dispatcher, |
content::P2PSocketDispatcher* p2p_socket_dispatcher, |
VideoCaptureImplManager* vc_manager, |
MediaStreamDependencyFactory* dependency_factory) |
- : dependency_factory_(dependency_factory), |
+ : content::RenderViewObserver(render_view), |
+ dependency_factory_(dependency_factory), |
media_stream_dispatcher_(media_stream_dispatcher), |
p2p_socket_dispatcher_(p2p_socket_dispatcher), |
network_manager_(NULL), |
@@ -460,7 +462,7 @@ bool MediaStreamImpl::EnsurePeerConnectionFactory() { |
base::WaitableEvent event(true, false); |
chrome_worker_thread_.message_loop()->PostTask(FROM_HERE, base::Bind( |
&MediaStreamImpl::InitializeWorkerThread, |
- this, |
+ base::Unretained(this), |
&worker_thread_, |
&event)); |
event.Wait(); |
@@ -471,7 +473,7 @@ bool MediaStreamImpl::EnsurePeerConnectionFactory() { |
base::WaitableEvent event(true, false); |
chrome_worker_thread_.message_loop()->PostTask(FROM_HERE, base::Bind( |
&MediaStreamImpl::CreateIpcNetworkManagerOnWorkerThread, |
- this, |
+ base::Unretained(this), |
&event)); |
event.Wait(); |
} |