Refactor MediaStreamImpl and PeerConnection glue implementation after WebKit changes.

content/renderer/media/peer_connection_handler_jsep.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/peer_connection_handler_jsep.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "content/renderer/media/media_stream_dependency_factory.h"
 #include "content/renderer/media/media_stream_impl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebICECandidateDescriptor.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebICEOptions.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConnection00HandlerClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaHints.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/WebSessionDescriptionDescriptor.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
 
 PeerConnectionHandlerJsep::PeerConnectionHandlerJsep(
     WebKit::WebPeerConnection00HandlerClient* client,
-    MediaStreamImpl* msi,
     MediaStreamDependencyFactory* dependency_factory)
-    : PeerConnectionHandlerBase(msi, dependency_factory),
+    : PeerConnectionHandlerBase(dependency_factory),
       client_(client) {
 }
 
 PeerConnectionHandlerJsep::~PeerConnectionHandlerJsep() {
 }
 
 void PeerConnectionHandlerJsep::initialize(
     const WebKit::WebString& server_configuration,
     const WebKit::WebString& username) {
   native_peer_connection_ = dependency_factory_->CreatePeerConnection(
@@ skipping 136 matching lines @@
   native_peer_connection_->CommitStreamChanges();
 }
 
 void PeerConnectionHandlerJsep::removeStream(
     const WebKit::WebMediaStreamDescriptor& stream) {
   RemoveStream(stream);
   native_peer_connection_->CommitStreamChanges();
 }
 
 void PeerConnectionHandlerJsep::stop() {
-  // TODO(ronghuawu): There's an issue with signaling messages being sent during
-  // close. We need to investigate further. Not calling Close() on native
-  // PeerConnection is OK for now.
+  DVLOG(1) << "PeerConnectionHandlerJsep::stop";
   native_peer_connection_ = NULL;
-  media_stream_impl_->ClosePeerConnection(this);
 }
 
 void PeerConnectionHandlerJsep::OnError() {
   // TODO(grunell): Implement.
   NOTIMPLEMENTED();
 }
 
 void PeerConnectionHandlerJsep::OnMessage(const std::string& msg) {
   // TODO(grunell): Implement.
   NOTIMPLEMENTED();
@@ skipping 158 matching lines @@
       return false;
     case ActionSDPAnswer:
       *native_action = webrtc::PeerConnectionInterface::kAnswer;
       break;
     default:
       NOTREACHED();
       return false;
   }
   return true;
 }