Remove GetAudioManager and GetMediaStreamManager from ResourceContext. The reason is the content mo…

content/browser/renderer_host/media/video_capture_host_unittest.cc

 // Copyright (c) 2012 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/bind.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 13 matching lines @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::AtLeast;
 using ::testing::AnyNumber;
 using ::testing::DoAll;
 using ::testing::InSequence;
 using ::testing::Mock;
 using ::testing::Return;
 using content::BrowserThread;
-
 using content::BrowserThreadImpl;
 
 // Id used to identify the capture session between renderer and
 // video_capture_host.
 static const int kDeviceId = 1;
 // Id of a video capture device
 static const media::VideoCaptureSessionId kTestFakeDeviceId =
     media_stream::VideoCaptureManager::kStartOpenSessionId;
 
 // Define to enable test where video is dumped to file.
@@ skipping 19 matching lines @@
     }
   }
 
  private:
   file_util::ScopedFILE file_;
   int expected_size_;
 };
 
 class MockVideoCaptureHost : public VideoCaptureHost {
  public:
-  explicit MockVideoCaptureHost(content::ResourceContext* resource_context)
-      : VideoCaptureHost(resource_context),
+  explicit MockVideoCaptureHost(content::ResourceContext* resource_context,

[tommi (sloooow) - chröme, 2012/02/23 07:50:59]

no need for explicit anymore

[jam, 2012/02/23 08:05:09]

Done.

+                                AudioManager* audio_manager)
+      : VideoCaptureHost(resource_context, audio_manager),
         return_buffers_(false),
         dump_video_(false) {}
   virtual ~MockVideoCaptureHost() {
     STLDeleteContainerPairSecondPointers(filled_dib_.begin(),
                                          filled_dib_.end());
   }
 
   // A list of mock methods.
   MOCK_METHOD4(OnNewBufferCreated,
                void(int device_id, base::SharedMemoryHandle handle,
@@ skipping 113 matching lines @@
     // ResourceContext must be created on the UI thread.
     ui_thread_.reset(new BrowserThreadImpl(BrowserThread::UI,
                                            message_loop_.get()));
 
     // MediaStreamManager must be created on the IO thread.
     io_thread_.reset(new BrowserThreadImpl(BrowserThread::IO,
                                            message_loop_.get()));
 
     audio_manager_.reset(AudioManager::Create());
 
-    // Create a MediaStreamManager instance and hand over pointer to
-    // ResourceContext.
-    media_stream_manager_.reset(new media_stream::MediaStreamManager(
-        audio_manager_.get()));
-
 #ifndef TEST_REAL_CAPTURE_DEVICE
-    media_stream_manager_->UseFakeDevice();
+    media_stream::MediaStreamManager::GetForResourceContext(
+        &resource_context_, audio_manager_.get())->UseFakeDevice();
 #endif
 
-    resource_context_.set_media_stream_manager(media_stream_manager_.get());
-    host_ = new MockVideoCaptureHost(&resource_context_);
+    host_ = new MockVideoCaptureHost(&resource_context_, audio_manager_.get());
 
     // 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 12 matching lines @@
     SyncWithVideoCaptureManagerThread();
   }
 
   // Called on the VideoCaptureManager thread.
   static void PostQuitMessageLoop(MessageLoop* message_loop) {
     message_loop->PostTask(FROM_HERE, MessageLoop::QuitClosure());
   }
 
   // Called on the main thread.
   static void PostQuitOnVideoCaptureManagerThread(
-      MessageLoop* message_loop, content::ResourceContext* resource_context) {
-    resource_context->GetMediaStreamManager()->video_capture_manager()->
-        GetMessageLoop()->PostTask(FROM_HERE,
-                                   base::Bind(&PostQuitMessageLoop,
-                                              message_loop));
+      MessageLoop* message_loop, content::ResourceContext* resource_context,
+      AudioManager* audio_manager) {
+    media_stream::MediaStreamManager* manager =
+        media_stream::MediaStreamManager::GetForResourceContext(
+            resource_context, audio_manager);
+    manager->video_capture_manager()->GetMessageLoop()->PostTask(
+        FROM_HERE, base::Bind(&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,
-        base::Bind(&PostQuitOnVideoCaptureManagerThread,
-                   message_loop_.get(), &resource_context_));
+        base::Bind(&PostQuitOnVideoCaptureManagerThread, message_loop_.get(),
+                   &resource_context_, audio_manager_.get()));
     message_loop_->Run();
   }
 
   void StartCapture() {
     InSequence s;
     // 1. First - get info about the new resolution
     EXPECT_CALL(*host_, OnDeviceInfo(kDeviceId));
 
     // 2. Change state to started
     EXPECT_CALL(*host_, OnStateChanged(kDeviceId,
@@ skipping 78 matching lines @@
     host_->OnError(id);
     SyncWithVideoCaptureManagerThread();
   }
 
   scoped_refptr<MockVideoCaptureHost> host_;
 
  private:
   scoped_ptr<MessageLoop> message_loop_;
   scoped_ptr<BrowserThreadImpl> ui_thread_;
   scoped_ptr<BrowserThreadImpl> io_thread_;
-  scoped_ptr<media_stream::MediaStreamManager> media_stream_manager_;
   scoped_ptr<AudioManager> audio_manager_;
   content::MockResourceContext resource_context_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureHostTest);
 };
 
 TEST_F(VideoCaptureHostTest, StartCapture) {
   StartCapture();
 }
 
@@ skipping 22 matching lines @@
 }
 
 #ifdef DUMP_VIDEO
 TEST_F(VideoCaptureHostTest, CaptureAndDumpVideoVga) {
   CaptureAndDumpVideo(640, 480, 30);
 }
 TEST_F(VideoCaptureHostTest, CaptureAndDump720P) {
   CaptureAndDumpVideo(1280, 720, 30);
 }
 #endif