Removing singelton property of MediaStreamManager.

content/browser/renderer_host/media/media_stream_dispatcher_host.cc

Index: content/browser/renderer_host/media/media_stream_dispatcher_host.cc
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 9f7ddb7b07dd482527c8bd8ad6c6882e1f95abcf..ba4b8a0d4bc3d6ffff2a6d965eb95a7b5dc576e5 100644
--- a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
+++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
@@ -4,20 +4,23 @@
 
 #include "content/browser/renderer_host/media/media_stream_dispatcher_host.h"
 
+#include "content/browser/resource_context.h"
 #include "content/common/media/media_stream_messages.h"
 #include "content/common/media/media_stream_options.h"
 
 namespace media_stream {
 
-MediaStreamDispatcherHost::MediaStreamDispatcherHost(int render_process_id)
-    : render_process_id_(render_process_id) {
+MediaStreamDispatcherHost::MediaStreamDispatcherHost(
+    const content::ResourceContext* resource_context, int render_process_id)
+    : resource_context_(resource_context),
+      render_process_id_(render_process_id) {
 }
 
 MediaStreamDispatcherHost::~MediaStreamDispatcherHost() {
 }
 
 MediaStreamManager* MediaStreamDispatcherHost::manager() {
-  return MediaStreamManager::Get();
+  return resource_context_->media_stream_manager();
 }
 
 bool MediaStreamDispatcherHost::OnMessageReceived(
@@ -36,13 +39,17 @@ void MediaStreamDispatcherHost::OnChannelClosing() {
   BrowserMessageFilter::OnChannelClosing();
   VLOG(1) << "MediaStreamDispatcherHost::OnChannelClosing";
 
+  // TODO(mflodman) Remove this temporary solution when shut-down issue is
+  // resolved, i.e. uncomment the code below.
   // Since the IPC channel is gone, close all requested VideCaptureDevices and
   // cancel pending requests.
-  manager()->CancelRequests(this);
-  for (StreamMap::iterator it = streams_.begin(); it != streams_.end(); it++) {
-    std::string label = it->first;
-    manager()->StopGeneratedStream(label);
-  }
+//  manager()->CancelRequests(this);
+//  for (StreamMap::iterator it = streams_.begin();
+//       it != streams_.end();
+//       it++) {
+//    std::string label = it->first;
+//    manager()->StopGeneratedStream(label);
+//  }
 }
 
 void MediaStreamDispatcherHost::OnGenerateStream(