Refactor MediaStreamImpl and PeerConnection glue implementation after WebKit changes.

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 e9a50e8fac11b5b469bff14023ba720892c1a8eb..056048a5c582a4ac1da80d4ac0912a221e177307 100644
--- a/content/renderer/media/peer_connection_handler.h
+++ b/content/renderer/media/peer_connection_handler.h
@@ -23,7 +23,6 @@ class CONTENT_EXPORT PeerConnectionHandler
  public:
   PeerConnectionHandler(
       WebKit::WebPeerConnectionHandlerClient* client,
-      MediaStreamImpl* msi,
       MediaStreamDependencyFactory* dependency_factory);
   virtual ~PeerConnectionHandler();
 
@@ -57,8 +56,6 @@ class CONTENT_EXPORT PeerConnectionHandler
   virtual void OnIceComplete() OVERRIDE;
 
  private:
-  FRIEND_TEST_ALL_PREFIXES(PeerConnectionHandlerTest, Basic);
-
   void OnAddStreamCallback(webrtc::MediaStreamInterface* stream);
   void OnRemoveStreamCallback(webrtc::MediaStreamInterface* stream);