content/browser/renderer_host/media/audio_input_device_manager_unittest.cc - Issue 8392042: Split BrowserThread into public API and private implementation, step 1.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/media/audio_input_device_manager_unittest.cc

Issue 8392042: Split BrowserThread into public API and private implementation, step 1. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: 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

« no previous file with comments | « content/browser/renderer_host/media/audio_input_device_manager.cc ('k') | content/browser/renderer_host/media/audio_input_renderer_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 8892c93251aa30a7516035e93fd25a20be72968b..dd6d3038e432e35d33c395859e2b2321266d85e8 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.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"

@@ -85,7 +85,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 BrowserThread(BrowserThread::IO, message_loop_.get()));

+ io_thread_.reset(new content::TestBrowserThread(BrowserThread::IO,

+ message_loop_.get()));

manager_.reset(new media_stream::AudioInputDeviceManager());

audio_input_listener_.reset(new MockAudioInputDeviceManagerListener());

manager_->Register(audio_input_listener_.get());

@@ -127,7 +128,7 @@ class AudioInputDeviceManagerTest: public testing::Test {

message_loop_->Run();

}

scoped_ptr<MessageLoop> message_loop_;

- scoped_ptr<BrowserThread> io_thread_;

+ scoped_ptr<content::TestBrowserThread> io_thread_;

scoped_ptr<AudioInputDeviceManager> manager_;

scoped_ptr<MockAudioInputDeviceManagerListener> audio_input_listener_;