content/renderer/media/media_stream_impl_unittest.cc - Issue 10917167: Refactor the P2PSocketDispatcher to be created on the RenderThread instead of the RenderView.

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/renderer/media/media_stream_impl_unittest.cc

Issue 10917167: Refactor the P2PSocketDispatcher to be created on the RenderThread instead of the RenderView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Removed unnecessary destruction callback. Removed remaining routing_id. Created 8 years, 3 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

« content/browser/renderer_host/p2p/socket_dispatcher_host.cc ('K') | « content/renderer/media/media_stream_impl.cc ('k') | content/renderer/p2p/host_address_request.cc » ('j') | content/renderer/p2p/socket_dispatcher.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/media_stream_impl_unittest.cc

diff --git a/content/renderer/media/media_stream_impl_unittest.cc b/content/renderer/media/media_stream_impl_unittest.cc

index 4d7164fcdad3ffe8d81eac6daeab5b178981cc59..cd8baedc7aca2539141500936e004493686c8d4d 100644

--- a/content/renderer/media/media_stream_impl_unittest.cc

+++ b/content/renderer/media/media_stream_impl_unittest.cc

@@ -53,7 +53,8 @@ class MediaStreamImplTest : public ::testing::Test {

void SetUp() {

// Create our test object.

ms_dispatcher_.reset(new MockMediaStreamDispatcher());

- p2p_socket_dispatcher_.reset(new content::P2PSocketDispatcher(NULL));

+ p2p_socket_dispatcher_ = new content::P2PSocketDispatcher(

+ loop_.message_loop_proxy());

scoped_refptr<VideoCaptureImplManager> vc_manager(

new VideoCaptureImplManager());

MockMediaStreamDependencyFactory* dependency_factory =

@@ -108,7 +109,7 @@ class MediaStreamImplTest : public ::testing::Test {

protected:

MessageLoop loop_;

scoped_ptr<MockMediaStreamDispatcher> ms_dispatcher_;

- scoped_ptr<content::P2PSocketDispatcher> p2p_socket_dispatcher_;

+ scoped_refptr<content::P2PSocketDispatcher> p2p_socket_dispatcher_;

scoped_ptr<MediaStreamImplUnderTest> ms_impl_;

};