Adding JSEP PeerConnection glue - attempt 2

content/renderer/media/peer_connection_handler.h

Index: content/renderer/media/peer_connection_handler.h
diff --git a/content/renderer/media/peer_connection_handler.h b/content/renderer/media/peer_connection_handler.h
index aa969a1bc6d496c471634c6ca4588dc4d3ad51d9..e9a50e8fac11b5b469bff14023ba720892c1a8eb 100644
--- a/content/renderer/media/peer_connection_handler.h
+++ b/content/renderer/media/peer_connection_handler.h
@@ -5,28 +5,21 @@
 #ifndef CONTENT_RENDERER_MEDIA_PEER_CONNECTION_HANDLER_H_
 #define CONTENT_RENDERER_MEDIA_PEER_CONNECTION_HANDLER_H_
 
-#include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/message_loop_proxy.h"
 #include "content/common/content_export.h"
-#include "third_party/libjingle/source/talk/app/webrtc/mediastream.h"
-#include "third_party/libjingle/source/talk/app/webrtc/peerconnection.h"
+#include "content/renderer/media/peer_connection_handler_base.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConnectionHandler.h"
 
-class MediaStreamDependencyFactory;
-class MediaStreamImpl;
-
-// PeerConnectionHandler is a delegate for the PeerConnection API messages going
-// between WebKit and native PeerConnection in libjingle. It's owned by
-// WebKit.
+// PeerConnectionHandler is a delegate for the ROAP PeerConnection API messages
+// going between WebKit and native PeerConnection in libjingle. It's owned by
+// WebKit. ROAP PeerConnection will be removed soon.
 class CONTENT_EXPORT PeerConnectionHandler
-    : NON_EXPORTED_BASE(public WebKit::WebPeerConnectionHandler),
-      NON_EXPORTED_BASE(public webrtc::PeerConnectionObserver) {
+    : public PeerConnectionHandlerBase,
+      NON_EXPORTED_BASE(public WebKit::WebPeerConnectionHandler) {
  public:
   PeerConnectionHandler(
       WebKit::WebPeerConnectionHandlerClient* client,
@@ -34,11 +27,6 @@ class CONTENT_EXPORT PeerConnectionHandler
       MediaStreamDependencyFactory* dependency_factory);
   virtual ~PeerConnectionHandler();
 
-  // Set the video renderer for the specified stream.
-  virtual void SetVideoRenderer(
-      const std::string& stream_label,
-      webrtc::VideoRendererWrapperInterface* renderer);
-
   // WebKit::WebPeerConnectionHandler implementation
   virtual void initialize(
       const WebKit::WebString& server_configuration,
@@ -71,37 +59,12 @@ class CONTENT_EXPORT PeerConnectionHandler
  private:
   FRIEND_TEST_ALL_PREFIXES(PeerConnectionHandlerTest, Basic);
 
-  void AddStreams(
-      const WebKit::WebVector<WebKit::WebMediaStreamDescriptor>& streams);
-  void RemoveStreams(
-      const WebKit::WebVector<WebKit::WebMediaStreamDescriptor>& streams);
   void OnAddStreamCallback(webrtc::MediaStreamInterface* stream);
   void OnRemoveStreamCallback(webrtc::MediaStreamInterface* stream);
-  WebKit::WebMediaStreamDescriptor CreateWebKitStreamDescriptor(
-      webrtc::MediaStreamInterface* stream);
 
   // client_ is a weak pointer, and is valid until stop() has returned.
   WebKit::WebPeerConnectionHandlerClient* client_;
 
-  // media_stream_impl_ is a weak pointer, and is valid for the lifetime of this
-  // class. Calls to it must be done on the render thread.
-  MediaStreamImpl* media_stream_impl_;
-
-  // dependency_factory_ is a weak pointer, and is valid for the lifetime of
-  // MediaStreamImpl.
-  MediaStreamDependencyFactory* dependency_factory_;
-
-  // native_peer_connection_ is the native PeerConnection object,
-  // it handles the ICE processing and media engine.
-  talk_base::scoped_refptr<webrtc::PeerConnectionInterface>
-      native_peer_connection_;
-
-  typedef std::map<webrtc::MediaStreamInterface*,
-                   WebKit::WebMediaStreamDescriptor> RemoteStreamMap;
-  RemoteStreamMap remote_streams_;
-
-  scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
-
   DISALLOW_COPY_AND_ASSIGN(PeerConnectionHandler);
 };