diff options
author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-11 11:34:04 +0000 |
---|---|---|
committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-11 11:34:04 +0000 |
commit | bcd1df77729e966a225de98957dbaf0c687a89d0 (patch) | |
tree | 204a0ce6fa40668596705cb3dc8798da4cd4cbff /content/renderer/media/media_stream_impl_unittest.cc | |
parent | e06a00f7713273eed6b164fbeb770533aa20b682 (diff) | |
download | chromium_src-bcd1df77729e966a225de98957dbaf0c687a89d0.zip chromium_src-bcd1df77729e966a225de98957dbaf0c687a89d0.tar.gz chromium_src-bcd1df77729e966a225de98957dbaf0c687a89d0.tar.bz2 |
Revert 117201 - Adding support for MediaStream and PeerConnection functionality.
Reason for revert: libyuv breakage on the chromium os arm bots.
BUG=
TEST=content_unittests
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=117187
Review URL: http://codereview.chromium.org/8060055
TBR=grunell@chromium.org
Review URL: http://codereview.chromium.org/9186004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117202 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 | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/content/renderer/media/media_stream_impl_unittest.cc b/content/renderer/media/media_stream_impl_unittest.cc deleted file mode 100644 index ffa4e23..0000000 --- a/content/renderer/media/media_stream_impl_unittest.cc +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "base/memory/scoped_ptr.h" -#include "base/message_loop.h" -#include "content/renderer/media/media_stream_impl.h" -#include "content/renderer/media/mock_media_stream_dependency_factory.h" -#include "content/renderer/media/mock_media_stream_dispatcher.h" -#include "content/renderer/media/mock_web_peer_connection_handler_client.h" -#include "content/renderer/media/video_capture_impl_manager.h" -#include "content/renderer/p2p/socket_dispatcher.h" -#include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConnectionHandler.h" - -TEST(MediaStreamImplTest, Basic) { - MessageLoop loop; - - // Create our test object. - scoped_ptr<MockMediaStreamDispatcher> ms_dispatcher( - new MockMediaStreamDispatcher()); - scoped_ptr<content::P2PSocketDispatcher> p2p_socket_dispatcher( - new content::P2PSocketDispatcher(NULL)); - scoped_refptr<VideoCaptureImplManager> vc_manager( - new VideoCaptureImplManager()); - MockMediaStreamDependencyFactory* dependency_factory = - new MockMediaStreamDependencyFactory(); - scoped_refptr<MediaStreamImpl> ms_impl(new MediaStreamImpl( - ms_dispatcher.get(), - p2p_socket_dispatcher.get(), - vc_manager.get(), - dependency_factory)); - - // TODO(grunell): Add tests for WebKit::WebUserMediaClient and - // MediaStreamDispatcherEventHandler implementations. - - WebKit::MockWebPeerConnectionHandlerClient client; - WebKit::WebPeerConnectionHandler* pc_handler = - ms_impl->CreatePeerConnectionHandler(&client); - EXPECT_TRUE(ms_impl->peer_connection_handler_); - - ms_impl->ClosePeerConnection(); - EXPECT_FALSE(ms_impl->peer_connection_handler_); - delete pc_handler; -} |