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

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

Issue 16092013: Use base::MessageLoop in more files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase again, sigh Created 7 years, 6 months 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include <string> 5 #include <string>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "content/browser/browser_thread_impl.h" 9 #include "content/browser/browser_thread_impl.h"
10 #include "content/browser/renderer_host/media/media_stream_dispatcher_host.h" 10 #include "content/browser/renderer_host/media/media_stream_dispatcher_host.h"
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 MediaStreamDispatcherHostTest() : old_browser_client_(NULL) {} 135 MediaStreamDispatcherHostTest() : old_browser_client_(NULL) {}
136 virtual ~MediaStreamDispatcherHostTest() {} 136 virtual ~MediaStreamDispatcherHostTest() {}
137 137
138 void WaitForResult() { 138 void WaitForResult() {
139 message_loop_->Run(); 139 message_loop_->Run();
140 } 140 }
141 141
142 protected: 142 protected:
143 virtual void SetUp() OVERRIDE { 143 virtual void SetUp() OVERRIDE {
144 // MediaStreamManager must be created and called on IO thread. 144 // MediaStreamManager must be created and called on IO thread.
145 message_loop_.reset(new MessageLoop(base::MessageLoop::TYPE_IO)); 145 message_loop_.reset(new base::MessageLoop(base::MessageLoop::TYPE_IO));
146 ui_thread_.reset(new TestBrowserThread(BrowserThread::UI, 146 ui_thread_.reset(new TestBrowserThread(BrowserThread::UI,
147 message_loop_.get())); 147 message_loop_.get()));
148 io_thread_.reset(new TestBrowserThread(BrowserThread::IO, 148 io_thread_.reset(new TestBrowserThread(BrowserThread::IO,
149 message_loop_.get())); 149 message_loop_.get()));
150 150
151 // Create our own MediaStreamManager. 151 // Create our own MediaStreamManager.
152 audio_manager_.reset(media::AudioManager::Create()); 152 audio_manager_.reset(media::AudioManager::Create());
153 media_stream_manager_.reset(new MediaStreamManager(audio_manager_.get())); 153 media_stream_manager_.reset(new MediaStreamManager(audio_manager_.get()));
154 // Make sure we use fake devices to avoid long delays. 154 // Make sure we use fake devices to avoid long delays.
155 media_stream_manager_->UseFakeDevice(); 155 media_stream_manager_->UseFakeDevice();
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 EXPECT_EQ(host_->NumberOfStreams(), 1u); 349 EXPECT_EQ(host_->NumberOfStreams(), 1u);
350 350
351 ASSERT_FALSE(close_callback.is_null()); 351 ASSERT_FALSE(close_callback.is_null());
352 close_callback.Run(); 352 close_callback.Run();
353 message_loop_->RunUntilIdle(); 353 message_loop_->RunUntilIdle();
354 354
355 EXPECT_EQ(host_->NumberOfStreams(), 0u); 355 EXPECT_EQ(host_->NumberOfStreams(), 0u);
356 } 356 }
357 357
358 }; // namespace content 358 }; // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698