Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(664)

Unified Diff: content/renderer/media/media_stream_dependency_factory_unittest.cc

Issue 10703095: New PeerConnection handler in Chrome to support latest PeerConnection draft (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Readd the UMA histogram for Deprecated PeerConnection to not screw up the stats. 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
Index: content/renderer/media/media_stream_dependency_factory_unittest.cc
diff --git a/content/renderer/media/media_stream_dependency_factory_unittest.cc b/content/renderer/media/media_stream_dependency_factory_unittest.cc
index a1a11310217bd534e7093f447d964a1b5cddda86..5d0f7ba4a568f31f814c307261a226fbfc847dfd 100644
--- a/content/renderer/media/media_stream_dependency_factory_unittest.cc
+++ b/content/renderer/media/media_stream_dependency_factory_unittest.cc
@@ -8,14 +8,15 @@
#include "content/renderer/media/media_stream_source_extra_data.h"
#include "content/renderer/media/mock_media_stream_dependency_factory.h"
#include "content/renderer/media/mock_web_peer_connection_00_handler_client.h"
+#include "content/renderer/media/mock_web_rtc_peer_connection_handler_client.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamComponent.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamDescriptor.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/WebMediaStreamComponent.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamDescriptor.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/WebPeerConnectionHandler.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebRTCPeerConnectionHandler.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h"
class MediaStreamDependencyFactoryTest : public ::testing::Test {
public:
@@ -63,12 +64,17 @@ class MediaStreamDependencyFactoryTest : public ::testing::Test {
};
TEST_F(MediaStreamDependencyFactoryTest, CreatePeerConnectionHandlerJsep) {
- // Create JSEP PeerConnection.
WebKit::MockWebPeerConnection00HandlerClient client_jsep;
scoped_ptr<WebKit::WebPeerConnection00Handler> pc_handler_jsep(
dependency_factory_->CreatePeerConnectionHandlerJsep(&client_jsep));
EXPECT_TRUE(pc_handler_jsep.get() != NULL);
- pc_handler_jsep.reset();
+}
+
+TEST_F(MediaStreamDependencyFactoryTest, CreateRTCPeerConnectionHandler) {
+ WebKit::MockWebRTCPeerConnectionHandlerClient client_jsep;
+ scoped_ptr<WebKit::WebRTCPeerConnectionHandler> pc_handler(
+ dependency_factory_->CreateRTCPeerConnectionHandler(&client_jsep));
+ EXPECT_TRUE(pc_handler.get() != NULL);
}
TEST_F(MediaStreamDependencyFactoryTest, CreateNativeMediaStream) {

Powered by Google App Engine
This is Rietveld 408576698