Adding MediaStreamManager.

content/browser/renderer_host/media/video_capture_host_unittest.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.
 
 #include <map>
 #include <string>
 
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/stl_util-inl.h"
 #include "base/stringprintf.h"
 #include "content/browser/browser_thread.h"
+#include "content/browser/renderer_host/media/media_stream_manager.h"
 #include "content/browser/renderer_host/media/video_capture_host.h"
 #include "content/browser/renderer_host/media/video_capture_manager.h"
 #include "content/common/media/video_capture_messages.h"
 #include "media/video/capture/video_capture_types.h"
 
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::AtLeast;
@@ skipping 155 matching lines @@
 ACTION_P(ExitMessageLoop, message_loop) {
   message_loop->PostTask(FROM_HERE, new MessageLoop::QuitTask());
 }
 
 class VideoCaptureHostTest : public testing::Test {
  public:
   VideoCaptureHostTest() {}
 
  protected:
   virtual void SetUp() {
+    // Create a message loop so VideoCaptureHostTest can use it.
+    message_loop_.reset(new MessageLoop(MessageLoop::TYPE_IO));
+    io_thread_.reset(new BrowserThread(BrowserThread::IO, message_loop_.get()));
     // Setup the VideoCaptureManager to use fake video capture device.
 #ifndef TEST_REAL_CAPTURE_DEVICE
     media_stream::VideoCaptureManager* manager =
-        media_stream::VideoCaptureManager::Get();
+        media_stream::MediaStreamManager::Get()->video_capture_manager();
     manager->UseFakeDevice();
 #endif
-    // Create a message loop so VideoCaptureHostTest can use it.
-    message_loop_.reset(new MessageLoop(MessageLoop::TYPE_IO));
-    io_thread_.reset(new BrowserThread(BrowserThread::IO, message_loop_.get()));
     host_ = new MockVideoCaptureHost();
 
     // Simulate IPC channel connected.
     host_->OnChannelConnected(base::GetCurrentProcId());
   }
 
   virtual void TearDown() {
     // Verifies and removes the expectations on host_ and
     // returns true iff successful.
     Mock::VerifyAndClearExpectations(host_);
@@ skipping 15 matching lines @@
     io_thread_.reset();
   }
 
   // Called on the VideoCaptureManager thread.
   static void PostQuitMessageLoop(MessageLoop* message_loop) {
     message_loop->PostTask(FROM_HERE, new MessageLoop::QuitTask());
   }
 
   // Called on the main thread.
   static void PostQuitOnVideoCaptureManagerThread(MessageLoop* message_loop) {
-    media_stream::VideoCaptureManager::Get()->GetMessageLoop()->PostTask(
-        FROM_HERE, NewRunnableFunction(&PostQuitMessageLoop, message_loop));
+    media_stream::MediaStreamManager::Get()->video_capture_manager()->
+        GetMessageLoop()->PostTask(FROM_HERE,
+                                   NewRunnableFunction(
+                                       &PostQuitMessageLoop, message_loop));
   }
 
   // SyncWithVideoCaptureManagerThread() waits until all pending tasks on the
   // video_capture_manager thread are executed while also processing pending
   // task in message_loop_ on the current thread. It is used to synchronize
   // with the video capture manager thread when we are stopping a video
   // capture device.
   void SyncWithVideoCaptureManagerThread() {
     message_loop_->PostTask(
         FROM_HERE, NewRunnableFunction(&PostQuitOnVideoCaptureManagerThread,
@@ skipping 127 matching lines @@
 }
 
 #ifdef DUMP_VIDEO
 TEST_F(VideoCaptureHostTest, CaptureAndDumpVideoVga) {
   CaptureAndDumpVideo(640, 480, 30);
 }
 TEST_F(VideoCaptureHostTest, CaptureAndDump720P) {
   CaptureAndDumpVideo(1280, 720, 30);
 }
 #endif