Removing singleton property of MediaStreamManager and creating thread first when needed.

content/browser/renderer_host/browser_render_process_host.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Represents the browser side of the browser <--> renderer communication
 // channel. There will be one RenderProcessHost per renderer process.
 
 #include "content/browser/renderer_host/browser_render_process_host.h"
 
 #include <algorithm>
@@ skipping 341 matching lines @@
   ResourceMessageFilter* resource_message_filter = new ResourceMessageFilter(
       id(), ChildProcessInfo::RENDER_PROCESS,
       &browser_context()->GetResourceContext(),
       new RendererURLRequestContextSelector(browser_context(), id()),
       content::GetContentClient()->browser()->GetResourceDispatcherHost());
 
   channel_->AddFilter(resource_message_filter);
   channel_->AddFilter(new AudioInputRendererHost());
   channel_->AddFilter(
       new AudioRendererHost(&browser_context()->GetResourceContext()));
-  channel_->AddFilter(new VideoCaptureHost());
+  channel_->AddFilter(
+      new VideoCaptureHost(&browser_context()->GetResourceContext()));
   channel_->AddFilter(
       new AppCacheDispatcherHost(&browser_context()->GetResourceContext(),
                                  id()));
   channel_->AddFilter(new ClipboardMessageFilter());
   channel_->AddFilter(
       new DOMStorageMessageFilter(id(), browser_context()->GetWebKitContext()));
   channel_->AddFilter(
       new IndexedDBDispatcherHost(id(), browser_context()->GetWebKitContext()));
   channel_->AddFilter(
       GeolocationDispatcherHost::New(
           id(), browser_context()->GetGeolocationPermissionContext()));
   channel_->AddFilter(new GpuMessageFilter(id(), widget_helper_.get()));
-  channel_->AddFilter(new media_stream::MediaStreamDispatcherHost(id()));
+  channel_->AddFilter(new media_stream::MediaStreamDispatcherHost(
+      &browser_context()->GetResourceContext(), id()));
   channel_->AddFilter(new PepperFileMessageFilter(id(), browser_context()));
   channel_->AddFilter(
       new PepperMessageFilter(&browser_context()->GetResourceContext()));
   channel_->AddFilter(new speech_input::SpeechInputDispatcherHost(id()));
   channel_->AddFilter(
       new FileSystemDispatcherHost(&browser_context()->GetResourceContext()));
   channel_->AddFilter(new device_orientation::MessageFilter());
   channel_->AddFilter(
       new BlobMessageFilter(id(), browser_context()->GetBlobStorageContext()));
   channel_->AddFilter(new FileUtilitiesMessageFilter(id()));
@@ skipping 534 matching lines @@
 void BrowserRenderProcessHost::OnRevealFolderInOS(const FilePath& path) {
   // Only honor the request if appropriate persmissions are granted.
   if (ChildProcessSecurityPolicy::GetInstance()->CanReadFile(id(), path))
     content::GetContentClient()->browser()->RevealFolderInOS(path);
 }
 
 void BrowserRenderProcessHost::OnSavedPageAsMHTML(int job_id, bool success) {
   content::GetContentClient()->browser()->GetMHTMLGenerationManager()->
       MHTMLGenerated(job_id, success);
 }