Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1740)

Unified Diff: content/renderer/media/media_stream_impl.cc

Issue 10108016: Refactored MediaStreamImpl to be a RenderViewObserver as the other delegates in RenderViewImpl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed messed up MockMediaStreamImpl. Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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();
}

Powered by Google App Engine
This is Rietveld 408576698