Revert 131949 (multiple memory leaks) - Adding JSEP PeerConnection glue.

content/renderer/media/media_stream_impl_unittest.cc

Index: content/renderer/media/media_stream_impl_unittest.cc
===================================================================
--- content/renderer/media/media_stream_impl_unittest.cc	(revision 131960)
+++ content/renderer/media/media_stream_impl_unittest.cc	(working copy)
@@ -7,14 +7,10 @@
 #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_00_handler_client.h"
 #include "content/renderer/media/mock_web_peer_connection_handler_client.h"
-#include "content/renderer/media/peer_connection_handler.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 "testing/gtest/include/gtest/gtest.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConnection00Handler.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConnectionHandler.h"
 
 // Disabled due to http://crbug.com/112408 .
@@ -42,67 +38,9 @@
   WebKit::MockWebPeerConnectionHandlerClient client;
   WebKit::WebPeerConnectionHandler* pc_handler =
       ms_impl->CreatePeerConnectionHandler(&client);
-  EXPECT_EQ(1u, ms_impl->peer_connection_handlers_.size());
+  EXPECT_TRUE(ms_impl->peer_connection_handler_);
 
-  // Delete PC handler explicitly after closing to mimic WebKit behavior.
-  ms_impl->ClosePeerConnection(
-      static_cast<PeerConnectionHandler*>(pc_handler));
-  EXPECT_TRUE(ms_impl->peer_connection_handlers_.empty());
+  ms_impl->ClosePeerConnection();
+  EXPECT_FALSE(ms_impl->peer_connection_handler_);
   delete pc_handler;
-
-  WebKit::MockWebPeerConnection00HandlerClient client_jsep;
-  WebKit::WebPeerConnection00Handler* pc_handler_jsep =
-      ms_impl->CreatePeerConnectionHandlerJsep(&client_jsep);
-  EXPECT_EQ(1u, ms_impl->peer_connection_handlers_.size());
-
-  // Delete PC handler explicitly after closing to mimic WebKit behavior.
-  ms_impl->ClosePeerConnection(
-      static_cast<PeerConnectionHandlerJsep*>(pc_handler_jsep));
-  EXPECT_TRUE(ms_impl->peer_connection_handlers_.empty());
-  delete pc_handler_jsep;
 }
-
-// Disabled due to http://crbug.com/112408 .
-TEST(MediaStreamImplTest, DISABLED_MultiplePeerConnections) {
-  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_EQ(1u, ms_impl->peer_connection_handlers_.size());
-
-  WebKit::MockWebPeerConnection00HandlerClient client_jsep;
-  WebKit::WebPeerConnection00Handler* pc_handler_jsep =
-      ms_impl->CreatePeerConnectionHandlerJsep(&client_jsep);
-  EXPECT_EQ(2u, ms_impl->peer_connection_handlers_.size());
-
-  // Delete PC handler explicitly after closing to mimic WebKit behavior.
-  ms_impl->ClosePeerConnection(
-      static_cast<PeerConnectionHandler*>(pc_handler));
-  EXPECT_EQ(1u, ms_impl->peer_connection_handlers_.size());
-  delete pc_handler;
-
-  // Delete PC handler explicitly after closing to mimic WebKit behavior.
-  ms_impl->ClosePeerConnection(
-      static_cast<PeerConnectionHandlerJsep*>(pc_handler_jsep));
-  EXPECT_TRUE(ms_impl->peer_connection_handlers_.empty());
-  delete pc_handler_jsep;
-}