1 files changed, 13 insertions, 17 deletions
diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
index 7ae8e2d..27a628f 100644
--- a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
+++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
@@ -4,10 +4,12 @@
 
 #include "content/browser/renderer_host/media/media_stream_dispatcher_host.h"
 
+#include "content/browser/browser_main_loop.h"
 #include "content/common/media/media_stream_messages.h"
 #include "content/common/media/media_stream_options.h"
 #include "googleurl/src/gurl.h"
 
+using content::BrowserMainLoop;
 using content::BrowserMessageFilter;
 using content::BrowserThread;
 
@@ -24,13 +26,8 @@ struct MediaStreamDispatcherHost::StreamRequest {
   int page_request_id;
 };
 
-MediaStreamDispatcherHost::MediaStreamDispatcherHost(
-    content::ResourceContext* resource_context,
-    int render_process_id,
-    media::AudioManager* audio_manager)
-    : resource_context_(resource_context),
-      render_process_id_(render_process_id),
-      audio_manager_(audio_manager) {
+MediaStreamDispatcherHost::MediaStreamDispatcherHost(int render_process_id)
+    : render_process_id_(render_process_id) {
 }
 
 void MediaStreamDispatcherHost::StreamGenerated(
@@ -178,12 +175,12 @@ void MediaStreamDispatcherHost::OnChannelClosing() {
 
   // Since the IPC channel is gone, cancel pending requests and close all
   // requested VideoCaptureDevices.
-  manager()->CancelRequests(this);
+  GetManager()->CancelRequests(this);
   for (StreamMap::iterator it = streams_.begin();
        it != streams_.end();
        it++) {
     std::string label = it->first;
-    manager()->StopGeneratedStream(label);
+    GetManager()->StopGeneratedStream(label);
   }
 }
 
@@ -203,7 +200,7 @@ void MediaStreamDispatcherHost::OnGenerateStream(
            << security_origin.spec() << ")";
 
   std::string label;
-  manager()->GenerateStream(this, render_process_id_, render_view_id,
+  GetManager()->GenerateStream(this, render_process_id_, render_view_id,
                             components, security_origin, &label);
   DCHECK(!label.empty());
   streams_[label] = StreamRequest(render_view_id, page_request_id);
@@ -218,7 +215,7 @@ void MediaStreamDispatcherHost::OnCancelGenerateStream(int render_view_id,
   for (StreamMap::iterator it = streams_.begin(); it != streams_.end(); ++it) {
     if (it->second.render_view_id == render_view_id &&
         it->second.page_request_id == page_request_id) {
-      manager()->CancelGenerateStream(it->first);
+      GetManager()->CancelGenerateStream(it->first);
     }
   }
 }
@@ -230,7 +227,7 @@ void MediaStreamDispatcherHost::OnStopGeneratedStream(
 
   StreamMap::iterator it = streams_.find(label);
   DCHECK(it != streams_.end());
-  manager()->StopGeneratedStream(label);
+  GetManager()->StopGeneratedStream(label);
   streams_.erase(it);
 }
 
@@ -246,7 +243,7 @@ void MediaStreamDispatcherHost::OnEnumerateDevices(
            << security_origin.spec() << ")";
 
   std::string label;
-  manager()->EnumerateDevices(this, render_process_id_, render_view_id,
+  GetManager()->EnumerateDevices(this, render_process_id_, render_view_id,
                               type, security_origin, &label);
   DCHECK(!label.empty());
   streams_[label] = StreamRequest(render_view_id, page_request_id);
@@ -266,15 +263,14 @@ void MediaStreamDispatcherHost::OnOpenDevice(
            << security_origin.spec() << ")";
 
   std::string label;
-  manager()->OpenDevice(this, render_process_id_, render_view_id,
+  GetManager()->OpenDevice(this, render_process_id_, render_view_id,
                         device_id, type, security_origin, &label);
   DCHECK(!label.empty());
   streams_[label] = StreamRequest(render_view_id, page_request_id);
 }
 
-MediaStreamManager* MediaStreamDispatcherHost::manager() {
-  return MediaStreamManager::GetForResourceContext(
-      resource_context_, audio_manager_);
+MediaStreamManager* MediaStreamDispatcherHost::GetManager() {
+  return BrowserMainLoop::GetMediaStreamManager();
 }
 
 }  // namespace media_stream