diff options
| author | perkj@chromium.org <perkj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-12 10:37:55 +0000 |
|---|---|---|
| committer | perkj@chromium.org <perkj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-12 10:37:55 +0000 |
| commit | 4761cf18ebe31f8b60af22cf1f001df4a9baeccf (patch) | |
| tree | d2efa4f7120e13bfd3bab01b674127bf728f4a8c /content/renderer/media/media_stream_impl_unittest.cc | |
| parent | 52daa5d330204efb8d2e25ce73fb64a9f53f9863 (diff) | |
| download | chromium_src-4761cf18ebe31f8b60af22cf1f001df4a9baeccf.zip chromium_src-4761cf18ebe31f8b60af22cf1f001df4a9baeccf.tar.gz chromium_src-4761cf18ebe31f8b60af22cf1f001df4a9baeccf.tar.bz2 | |
Refactor the P2PSocketDispatcher to be created on the RenderThread instead of the RenderView.
Removes the use of routing_id.
The reason for this refactoring is that we want to be able to create a PeerConnection on the RenderThread instead of the RenderView.
PeerConnection is dependent on the P2PSocketDispatcher.
PeerConnections are created in renderer_webkitplatformsupport_impl and should not be affilitated with a render view.
https://chromiumcodereview.appspot.com/10703095/diff/13017/content/renderer/renderer_webkitplatformsupport_impl.cc
BUG=
Review URL: https://chromiumcodereview.appspot.com/10917167
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156274 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/media/media_stream_impl_unittest.cc')
| -rw-r--r-- | content/renderer/media/media_stream_impl_unittest.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/content/renderer/media/media_stream_impl_unittest.cc b/content/renderer/media/media_stream_impl_unittest.cc index fa7846f..c4e54ca 100644 --- a/content/renderer/media/media_stream_impl_unittest.cc +++ b/content/renderer/media/media_stream_impl_unittest.cc @@ -54,7 +54,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 = @@ -109,7 +110,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_; }; |