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

content/browser/renderer_host/media/media_stream_dispatcher_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 <string>
 
 #include "base/message_loop.h"
 #include "content/browser/renderer_host/media/media_stream_dispatcher_host.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 #include "content/browser/renderer_host/media/video_capture_manager.h"
+#include "content/browser/resource_context.h"
 #include "content/common/media/media_stream_messages.h"
 #include "content/common/media/media_stream_options.h"
 #include "ipc/ipc_message_macros.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::DeleteArg;
 using ::testing::DoAll;
 using ::testing::Return;
 
 const int kProcessId = 5;
 const int kRenderId = 6;
 const int kPageRequestId = 7;
 
+namespace content {
+// Test version of ResourceContext
+class MockMediaStreamResourceContext : public ResourceContext {

[scherkus (not reviewing), 2011/08/16 19:24:09]

you might be able to use MockResourceContext

content/browser/mock_resource_context.h

[mflodman_chromium_OOO, 2011/08/19 11:07:09]

This part was removed based on review feedback from wjia.

+ public:
+  MockMediaStreamResourceContext() {}
+  virtual ~MockMediaStreamResourceContext() {}
+
+  virtual media_stream::MediaStreamManager* media_stream_manger() const {
+    return media_stream_manager_.get();
+  }
+
+  void set_media_stream_manager(
+      media_stream::MediaStreamManager* media_stream_manager) {
+    media_stream_manager_ = media_stream_manager;
+  }
+
+ private:
+  // Pure virtual in ResourceContext.
+  virtual void EnsureInitialized() const {}
+
+  scoped_refptr<media_stream::MediaStreamManager> media_stream_manager_;
+};
+
+}  // namespace content
+
 namespace media_stream {
 
 class MockMediaStreamDispatcherHost : public MediaStreamDispatcherHost {
  public:
-  explicit MockMediaStreamDispatcherHost(MessageLoop* message_loop)
-      : MediaStreamDispatcherHost(kProcessId),
+  MockMediaStreamDispatcherHost(content::ResourceContext* resource_context,
+                                MessageLoop* message_loop)
+      : MediaStreamDispatcherHost(resource_context, kProcessId),
         message_loop_(message_loop) {}
   virtual ~MockMediaStreamDispatcherHost() {}
 
   // A list of mock methods.
   MOCK_METHOD4(OnStreamGenerated,
                void(int routing_id, int request_id, int audio_array_size,
                     int video_array_size));
   MOCK_METHOD2(OnStreamGenerationFailed, void(int routing_id, int request_id));
   MOCK_METHOD2(OnAudioDeviceFailed, void(int routing_id, int index));
   MOCK_METHOD2(OnVideoDeviceFailed, void(int routing_id, int index));
 
   // Accessor to private functions.
-  void OnGenerateStream(
-      int page_request_id,
-      const StreamOptions& components) {
+  void OnGenerateStream(int page_request_id, const StreamOptions& components) {
     MediaStreamDispatcherHost::OnGenerateStream(kRenderId,
                                                 page_request_id,
                                                 components,
                                                 std::string());
   }
   void OnStopGeneratedStream(const std::string& label) {
     MediaStreamDispatcherHost::OnStopGeneratedStream(kRenderId, label);
   }
 
   // Return the number of streams that have been opened or is being open.
@@ skipping 40 matching lines @@
       StreamDeviceInfoArray video_device_list) {
     OnStreamGenerated(msg.routing_id(), request_id, audio_device_list.size(),
         video_device_list.size());
     // Notify that the event have occured.
     message_loop_->PostTask(FROM_HERE, new MessageLoop::QuitTask());
     label_ = label;
     audio_devices_ = audio_device_list;
     video_devices_ = video_device_list;
   }
 
-  void OnStreamGenerationFailed(const IPC::Message& msg,
-                                int request_id) {
+  void OnStreamGenerationFailed(const IPC::Message& msg, int request_id) {
     OnStreamGenerationFailed(msg.routing_id(), request_id);
     message_loop_->PostTask(FROM_HERE, new MessageLoop::QuitTask());
     label_= "";
   }
 
   void OnAudioDeviceFailed(const IPC::Message& msg,
                            std::string label,
                            int index) {
     OnAudioDeviceFailed(msg.routing_id(), index);
     audio_devices_.erase(audio_devices_.begin() + index);
@@ skipping 12 matching lines @@
 };
 
 class MediaStreamDispatcherHostTest : public testing::Test {
  public:
   void WaitForResult() {
     message_loop_->Run();
   }
 
  protected:
   virtual void SetUp() {
-    // Create message loop so that
-    // DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)) passes.
     message_loop_.reset(new MessageLoop(MessageLoop::TYPE_IO));
+    // ResourceContext must be created on UI thread.
+    ui_thread_.reset(new BrowserThread(BrowserThread::UI, message_loop_.get()));
+    resource_context_.reset(new content::MockMediaStreamResourceContext());
+
+    // MediaStreamManager must be created and called on IO thread.
     io_thread_.reset(new BrowserThread(BrowserThread::IO, message_loop_.get()));
 
-    // Make sure the MediaStreamManager exist and use
-    // fake audio / video devices.
-    MediaStreamManager* manager = MediaStreamManager::Get();
-    manager->UseFakeDevice();
+    // Create a MediaStreamManager instance and hand over ownership to
+    // ResourceContext.
+    MediaStreamManager* media_stream_manager = new MediaStreamManager();
+    resource_context_->set_media_stream_manager(media_stream_manager);
 
-    host_ =
-        new MockMediaStreamDispatcherHost(message_loop_.get());
+    // Make sure we use fake devices to avoid long delays.
+    resource_context_->media_stream_manager()->UseFakeDevice();
+
+    host_ = new MockMediaStreamDispatcherHost(resource_context_.get(),
+                                              message_loop_.get());
+  }
+
+  virtual void TearDown() {
+    // Delete the threads in correct order.
+    io_thread_.reset();
+    ui_thread_.reset();
   }
 
   scoped_refptr<MockMediaStreamDispatcherHost> host_;
   scoped_ptr<MessageLoop> message_loop_;
+  scoped_ptr<BrowserThread> ui_thread_;
   scoped_ptr<BrowserThread> io_thread_;
+  scoped_ptr<content::ResourceContext> resource_context_;
 };
 
 TEST_F(MediaStreamDispatcherHostTest, GenerateStream) {
   StreamOptions options(false, StreamOptions::kFacingUser);
 
   EXPECT_CALL(*host_, OnStreamGenerated(kRenderId, kPageRequestId, 0, 1));
   host_->OnGenerateStream(kPageRequestId, options);
 
   WaitForResult();
 
@@ skipping 48 matching lines @@
   host_->OnGenerateStream(kPageRequestId, options);
   WaitForResult();
   std::string label =  host_->label_;
 
   EXPECT_EQ(host_->audio_devices_.size(), 0u);
   EXPECT_EQ(host_->video_devices_.size(), 1u);
   EXPECT_EQ(host_->NumberOfStreams(), 1u);
 
   EXPECT_CALL(*host_, OnVideoDeviceFailed(kRenderId, 0));
   int session_id = host_->video_devices_[0].session_id;
-  MediaStreamManager::Get()->video_capture_manager()->Error(session_id);
+  resource_context_->media_stream_manager()->video_capture_manager()->
+      Error(session_id);
   WaitForResult();
   EXPECT_EQ(host_->video_devices_.size(), 0u);
   EXPECT_EQ(host_->NumberOfStreams(), 1u);
 
   // TODO(perkj): test audio device failure?
 
   host_->OnStopGeneratedStream(label);
   EXPECT_EQ(host_->NumberOfStreams(), 0u);
 }
 
 };  // namespace media_stream