content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc - Issue 8340028: Salient parts of http://codereview.chromium.org/8392042/

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/media_stream_dispatcher_host_unittest.cc

Issue 8340028: Salient parts of http://codereview.chromium.org/8392042/ (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/media_stream_device_settings.cc ('k') | content/browser/renderer_host/media/media_stream_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc

diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc

index d9f7db7e3bfc71bcd8cc559da7256f767deb5766..a9afcee74cb47518e1fb56ec14342e63cc413a59 100644

--- a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc

+++ b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc

@@ -13,6 +13,7 @@

#include "content/browser/resource_context.h"

#include "content/common/media/media_stream_messages.h"

#include "content/common/media/media_stream_options.h"

+#include "content/test/test_browser_thread.h"

#include "ipc/ipc_message_macros.h"

#include "testing/gmock/include/gmock/gmock.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -141,9 +142,11 @@ class MediaStreamDispatcherHostTest : public testing::Test {

virtual void SetUp() {

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()));

+ ui_thread_.reset(new content::TestBrowserThread(BrowserThread::UI,

+ message_loop_.get()));

// MediaStreamManager must be created and called on IO thread.

- io_thread_.reset(new BrowserThread(BrowserThread::IO, message_loop_.get()));

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

+ message_loop_.get()));

// Create a MediaStreamManager instance and hand over pointer to

// ResourceContext.

@@ -193,8 +196,8 @@ class MediaStreamDispatcherHostTest : public testing::Test {

scoped_refptr<MockMediaStreamDispatcherHost> host_;

scoped_ptr<MessageLoop> message_loop_;

- scoped_ptr<BrowserThread> ui_thread_;

- scoped_ptr<BrowserThread> io_thread_;

+ scoped_ptr<content::TestBrowserThread> ui_thread_;

+ scoped_ptr<content::TestBrowserThread> io_thread_;

scoped_ptr<MediaStreamManager> media_stream_manager_;

};