| 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..1a34eb1e17b67b484a3ce03fc11e51d1af8e119e 100644
|
| --- a/content/renderer/media/media_stream_impl_unittest.cc
|
| +++ b/content/renderer/media/media_stream_impl_unittest.cc
|
| @@ -9,16 +9,16 @@
|
| #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_00_handler_client.h"
|
| -#include "content/renderer/media/mock_web_peer_connection_handler_client.h"
|
| +#include "content/renderer/media/mock_web_rtc_peer_connection_handler_client.h"
|
| #include "content/renderer/media/peer_connection_handler_jsep.h"
|
| #include "content/renderer/media/video_capture_impl_manager.h"
|
| #include "content/renderer/p2p/socket_dispatcher.h"
|
| #include "media/base/message_loop_factory.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamSource.h"
|
| -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConnection00Handler.h"
|
| -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConnectionHandler.h"
|
| -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
|
| +#include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamSource.h"
|
| +#include "third_party/WebKit/Source/Platform/chromium/public/WebPeerConnection00Handler.h"
|
| +#include "third_party/WebKit/Source/Platform/chromium/public/WebRTCPeerConnectionHandler.h"
|
| +#include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h"
|
|
|
| class MediaStreamImplUnderTest : public MediaStreamImpl {
|
| public:
|
| @@ -120,6 +120,15 @@ TEST_F(MediaStreamImplTest, CreatePeerConnection) {
|
| pc_handler_jsep.reset();
|
| }
|
|
|
| +TEST_F(MediaStreamImplTest, CreateRTCPeerConnection) {
|
| + // Create JSEP PeerConnection.
|
| + WebKit::MockWebRTCPeerConnectionHandlerClient client;
|
| + scoped_ptr<WebKit::WebRTCPeerConnectionHandler> pc_handler(
|
| + ms_impl_->CreateRTCPeerConnectionHandler(&client));
|
| + EXPECT_TRUE(pc_handler.get() != NULL);
|
| + pc_handler.reset();
|
| +}
|
| +
|
| TEST_F(MediaStreamImplTest, LocalMediaStream) {
|
| // Test a stream with both audio and video.
|
| WebKit::WebMediaStreamDescriptor mixed_desc = RequestLocalMediaStream(true,
|
|
|