Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(26)

Side by Side Diff: content/browser/renderer_host/media/video_capture_manager_unittest.cc

Issue 8400060: Switch content tests to use BrowserThreadImpl directly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to lkgr Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Unit test for VideoCaptureManager 5 // Unit test for VideoCaptureManager
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/message_loop.h" 11 #include "base/message_loop.h"
12 #include "base/process_util.h" 12 #include "base/process_util.h"
13 #include "content/browser/browser_thread_impl.h"
13 #include "content/browser/renderer_host/media/media_stream_provider.h" 14 #include "content/browser/renderer_host/media/media_stream_provider.h"
14 #include "content/browser/renderer_host/media/video_capture_manager.h" 15 #include "content/browser/renderer_host/media/video_capture_manager.h"
15 #include "content/common/media/media_stream_options.h" 16 #include "content/common/media/media_stream_options.h"
16 #include "content/test/test_browser_thread.h"
17 #include "media/video/capture/video_capture_device.h" 17 #include "media/video/capture/video_capture_device.h"
18 #include "testing/gmock/include/gmock/gmock.h" 18 #include "testing/gmock/include/gmock/gmock.h"
19 #include "testing/gtest/include/gtest/gtest.h" 19 #include "testing/gtest/include/gtest/gtest.h"
20 20
21 using ::testing::_; 21 using ::testing::_;
22 using ::testing::AnyNumber; 22 using ::testing::AnyNumber;
23 using ::testing::InSequence; 23 using ::testing::InSequence;
24 using ::testing::Return; 24 using ::testing::Return;
25 25
26 using content::BrowserThreadImpl;
27
26 namespace media_stream { 28 namespace media_stream {
27 29
28 // Listener class used to track progress of VideoCaptureManager test 30 // Listener class used to track progress of VideoCaptureManager test
29 class MockMediaStreamProviderListener : public MediaStreamProviderListener { 31 class MockMediaStreamProviderListener : public MediaStreamProviderListener {
30 public: 32 public:
31 MockMediaStreamProviderListener() 33 MockMediaStreamProviderListener()
32 : devices_() { 34 : devices_() {
33 } 35 }
34 ~MockMediaStreamProviderListener() {} 36 ~MockMediaStreamProviderListener() {}
35 37
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 message_loop_(), 77 message_loop_(),
76 io_thread_(), 78 io_thread_(),
77 frame_observer_() { 79 frame_observer_() {
78 } 80 }
79 virtual ~VideoCaptureManagerTest() {} 81 virtual ~VideoCaptureManagerTest() {}
80 82
81 protected: 83 protected:
82 virtual void SetUp() { 84 virtual void SetUp() {
83 listener_.reset(new media_stream::MockMediaStreamProviderListener()); 85 listener_.reset(new media_stream::MockMediaStreamProviderListener());
84 message_loop_.reset(new MessageLoop(MessageLoop::TYPE_IO)); 86 message_loop_.reset(new MessageLoop(MessageLoop::TYPE_IO));
85 io_thread_.reset(new content::TestBrowserThread(BrowserThread::IO, 87 io_thread_.reset(new BrowserThreadImpl(BrowserThread::IO,
86 message_loop_.get())); 88 message_loop_.get()));
87 vcm_.reset(new media_stream::VideoCaptureManager()); 89 vcm_.reset(new media_stream::VideoCaptureManager());
88 vcm_->UseFakeDevice(); 90 vcm_->UseFakeDevice();
89 vcm_->Register(listener_.get()); 91 vcm_->Register(listener_.get());
90 frame_observer_.reset(new MockFrameObserver()); 92 frame_observer_.reset(new MockFrameObserver());
91 } 93 }
92 94
93 virtual void TearDown() { 95 virtual void TearDown() {
94 io_thread_.reset(); 96 io_thread_.reset();
95 } 97 }
96 98
(...skipping 17 matching lines...) Expand all
114 void SyncWithVideoCaptureManagerThread() { 116 void SyncWithVideoCaptureManagerThread() {
115 message_loop_->PostTask( 117 message_loop_->PostTask(
116 FROM_HERE, base::Bind(&PostQuitOnVideoCaptureManagerThread, 118 FROM_HERE, base::Bind(&PostQuitOnVideoCaptureManagerThread,
117 message_loop_.get(), 119 message_loop_.get(),
118 vcm_.get())); 120 vcm_.get()));
119 message_loop_->Run(); 121 message_loop_->Run();
120 } 122 }
121 scoped_ptr<media_stream::VideoCaptureManager> vcm_; 123 scoped_ptr<media_stream::VideoCaptureManager> vcm_;
122 scoped_ptr<media_stream::MockMediaStreamProviderListener> listener_; 124 scoped_ptr<media_stream::MockMediaStreamProviderListener> listener_;
123 scoped_ptr<MessageLoop> message_loop_; 125 scoped_ptr<MessageLoop> message_loop_;
124 scoped_ptr<content::TestBrowserThread> io_thread_; 126 scoped_ptr<BrowserThreadImpl> io_thread_;
125 scoped_ptr<MockFrameObserver> frame_observer_; 127 scoped_ptr<MockFrameObserver> frame_observer_;
126 128
127 private: 129 private:
128 DISALLOW_COPY_AND_ASSIGN(VideoCaptureManagerTest); 130 DISALLOW_COPY_AND_ASSIGN(VideoCaptureManagerTest);
129 }; 131 };
130 132
131 // Test cases 133 // Test cases
132 134
133 // Try to open, start, stop and close a device. 135 // Try to open, start, stop and close a device.
134 TEST_F(VideoCaptureManagerTest, CreateAndClose) { 136 TEST_F(VideoCaptureManagerTest, CreateAndClose) {
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 vcm_->Open(*it); 301 vcm_->Open(*it);
300 302
301 // Wait to check callbacks before removing the listener 303 // Wait to check callbacks before removing the listener
302 SyncWithVideoCaptureManagerThread(); 304 SyncWithVideoCaptureManagerThread();
303 305
304 // Delete the manager. 306 // Delete the manager.
305 vcm_.reset(); 307 vcm_.reset();
306 } 308 }
307 309
308 } // namespace 310 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698