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

Unified Diff: content/browser/renderer_host/media/audio_input_device_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, 2 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/media/audio_input_device_manager_unittest.cc
diff --git a/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc b/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc
index dd6d3038e432e35d33c395859e2b2321266d85e8..7813706e7fdf93d50f123cb31cfbd4b785d18f78 100644
--- a/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc
+++ b/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc
@@ -7,9 +7,9 @@
#include "base/bind.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
+#include "content/browser/browser_thread_impl.h"
#include "content/browser/renderer_host/media/audio_input_device_manager.h"
#include "content/browser/renderer_host/media/audio_input_device_manager_event_handler.h"
-#include "content/test/test_browser_thread.h"
#include "media/audio/audio_manager.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -19,6 +19,8 @@ using ::testing::AnyNumber;
using ::testing::InSequence;
using ::testing::Return;
+using content::BrowserThreadImpl;
+
namespace media_stream {
class MockAudioInputDeviceManagerListener
@@ -85,8 +87,8 @@ class AudioInputDeviceManagerTest: public testing::Test {
virtual void SetUp() {
// The test must run on Browser::IO.
message_loop_.reset(new MessageLoop(MessageLoop::TYPE_IO));
- io_thread_.reset(new content::TestBrowserThread(BrowserThread::IO,
- message_loop_.get()));
+ io_thread_.reset(new BrowserThreadImpl(BrowserThread::IO,
+ message_loop_.get()));
manager_.reset(new media_stream::AudioInputDeviceManager());
audio_input_listener_.reset(new MockAudioInputDeviceManagerListener());
manager_->Register(audio_input_listener_.get());
@@ -128,7 +130,7 @@ class AudioInputDeviceManagerTest: public testing::Test {
message_loop_->Run();
}
scoped_ptr<MessageLoop> message_loop_;
- scoped_ptr<content::TestBrowserThread> io_thread_;
+ scoped_ptr<BrowserThreadImpl> io_thread_;
scoped_ptr<AudioInputDeviceManager> manager_;
scoped_ptr<MockAudioInputDeviceManagerListener> audio_input_listener_;
« no previous file with comments | « content/browser/plugin_loader_posix_unittest.cc ('k') | content/browser/renderer_host/media/audio_renderer_host_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698