Refactor the P2PSocketDispatcher to be created on the RenderThread instead of the RenderView.

content/renderer/media/media_stream_impl.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/media_stream_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 366 matching lines @@
                << "Stopping stream " << it->first;
       media_stream_dispatcher_->StopStream(it->first);
       local_media_streams_.erase(it);
       it = local_media_streams_.begin();
     } else {
       ++it;
     }
   }
 }
 
-void MediaStreamImpl::OnSocketDispatcherDestroyed() {
-  CleanupPeerConnectionFactory();
-}
-
 void MediaStreamImpl::InitializeWorkerThread(talk_base::Thread** thread,
                                              base::WaitableEvent* event) {
   jingle_glue::JingleThreadWrapper::EnsureForCurrentMessageLoop();
   jingle_glue::JingleThreadWrapper::current()->set_send_allowed(true);
   *thread = jingle_glue::JingleThreadWrapper::current();
   event->Signal();
 }
 
 void MediaStreamImpl::CreateIpcNetworkManagerOnWorkerThread(
     base::WaitableEvent* event) {
@@ skipping 34 matching lines @@
     DCHECK(worker_thread_);
   }
 
   if (!network_manager_) {
     base::WaitableEvent event(true, false);
     chrome_worker_thread_.message_loop()->PostTask(FROM_HERE, base::Bind(
           &MediaStreamImpl::CreateIpcNetworkManagerOnWorkerThread,
           base::Unretained(this),
           &event));
     event.Wait();
-    p2p_socket_dispatcher_->AddDestructionObserver(this);
   }
 
   if (!socket_factory_.get()) {
     socket_factory_.reset(
         new content::IpcPacketSocketFactory(p2p_socket_dispatcher_));
   }
 
   if (!dependency_factory_->PeerConnectionFactoryCreated()) {
     if (!dependency_factory_->CreatePeerConnectionFactory(
             worker_thread_,
@@ skipping 19 matching lines @@
       chrome_worker_thread_.message_loop()->PostTask(FROM_HERE, base::Bind(
           &MediaStreamImpl::DeleteIpcNetworkManager,
           base::Unretained(this)));
       // Stopping the thread will wait until all tasks have been
       // processed before returning. We wait for the above task to finish before
       // letting the the function continue to avoid any potential race issues.
       chrome_worker_thread_.Stop();
     } else {
       NOTREACHED() << "Worker thread not running.";
     }
-    p2p_socket_dispatcher_->RemoveDestructionObserver(this);
   }
 }
 
 scoped_refptr<media::VideoDecoder> MediaStreamImpl::CreateLocalVideoDecoder(
     webrtc::MediaStreamInterface* stream,
     media::MessageLoopFactory* message_loop_factory) {
   if (!stream->video_tracks() || stream->video_tracks()->count() == 0)
     return NULL;
 
   int video_session_id =
@@ skipping 101 matching lines @@
 MediaStreamExtraData::MediaStreamExtraData(
     webrtc::MediaStreamInterface* remote_stream)
     : remote_stream_(remote_stream) {
 }
 MediaStreamExtraData::MediaStreamExtraData(
     webrtc::LocalMediaStreamInterface* local_stream)
     : local_stream_(local_stream) {
 }
 MediaStreamExtraData::~MediaStreamExtraData() {
 }