commit 80b161a1954b9a3e8c9efe43c2d82488be7b9081
author wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Mon Jun 27 17:42:11 2011
committer wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Mon Jun 27 17:42:11 2011
tree 4d8bb0452cabc5bff5e31ab202253e4ac50ba061
parent 5c18c409e1164c4320788dcd4f6a48d4ee590e4d

move VideoCaptureImplManager from singleton to a member of RenderThread.
fix some comments.
BUG=none
TEST=try bots

Review URL: http://codereview.chromium.org/7265004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90605 0039d316-1c4b-4281-b951-d872f2087c98

content/renderer/render_thread.cc

diff --git a/content/renderer/render_thread.cc b/content/renderer/render_thread.cc
index 89f95d18..4dcc99b4 100644
--- a/content/renderer/render_thread.cc
+++ b/content/renderer/render_thread.cc
@@ -37,8 +37,8 @@
 #include "content/renderer/gpu/gpu_channel_host.h"
 #include "content/renderer/gpu/gpu_video_service_host.h"
 #include "content/renderer/indexed_db_dispatcher.h"
+#include "content/renderer/media/video_capture_impl_manager.h"
 #include "content/renderer/media/video_capture_message_filter.h"
-#include "content/renderer/media/video_capture_message_filter_creator.h"
 #include "content/renderer/plugin_channel_host.h"
 #include "content/renderer/render_process_impl.h"
 #include "content/renderer/render_process_observer.h"
@@ -171,9 +171,8 @@
   db_message_filter_ = new DBMessageFilter();
   AddFilter(db_message_filter_.get());
 
-  VideoCaptureMessageFilter* video_capture_message_filter =
-      VideoCaptureMessageFilterCreator::SharedFilter();
-  AddFilter(video_capture_message_filter);
+  vc_manager_ = new VideoCaptureImplManager();
+  AddFilter(vc_manager_->video_capture_message_filter());
 
   content::GetContentClient()->renderer()->RenderThreadStarted();
 
@@ -189,13 +188,11 @@
     web_database_observer_impl_->WaitForAllDatabasesToClose();
 
   // Shutdown in reverse of the initialization order.
+  RemoveFilter(vc_manager_->video_capture_message_filter());
+
   RemoveFilter(db_message_filter_.get());
   db_message_filter_ = NULL;
 
-  VideoCaptureMessageFilter* video_capture_message_filter =
-      VideoCaptureMessageFilterCreator::SharedFilter();
-  RemoveFilter(video_capture_message_filter);
-
   // Shutdown the file thread if it's running.
   if (file_thread_.get())
     file_thread_->Stop();