Refactored MediaStreamImpl to be a RenderViewObserver as the other delegates in RenderViewImpl.

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 55 matching lines @@
   size_t pos = manager_label.rfind("#");
   // If # isn't found, the string is left intact.
   manager_label = manager_label.substr(0, pos);
   return manager_label;
 }
 
 
 int MediaStreamImpl::next_request_id_ = 0;
 
 MediaStreamImpl::MediaStreamImpl(
+    content::RenderView* render_view,
     MediaStreamDispatcher* media_stream_dispatcher,
     content::P2PSocketDispatcher* p2p_socket_dispatcher,
     VideoCaptureImplManager* vc_manager,
     MediaStreamDependencyFactory* dependency_factory)
-    : dependency_factory_(dependency_factory),
+    : content::RenderViewObserver(render_view),
+      dependency_factory_(dependency_factory),
       media_stream_dispatcher_(media_stream_dispatcher),
       p2p_socket_dispatcher_(p2p_socket_dispatcher),
       network_manager_(NULL),
       vc_manager_(vc_manager),
       signaling_thread_(NULL),
       worker_thread_(NULL),
       chrome_worker_thread_("Chrome_libJingle_WorkerThread") {
 }
 
 MediaStreamImpl::~MediaStreamImpl() {
@@ skipping 362 matching lines @@
     if (!chrome_worker_thread_.IsRunning()) {
       if (!chrome_worker_thread_.Start()) {
         LOG(ERROR) << "Could not start worker thread";
         signaling_thread_ = NULL;
         return false;
       }
     }
     base::WaitableEvent event(true, false);
     chrome_worker_thread_.message_loop()->PostTask(FROM_HERE, base::Bind(
         &MediaStreamImpl::InitializeWorkerThread,
-        this,
+        base::Unretained(this),
         &worker_thread_,
         &event));
     event.Wait();
     DCHECK(worker_thread_);
   }
 
   if (!network_manager_) {
     base::WaitableEvent event(true, false);
     chrome_worker_thread_.message_loop()->PostTask(FROM_HERE, base::Bind(
           &MediaStreamImpl::CreateIpcNetworkManagerOnWorkerThread,
-          this,
+          base::Unretained(this),
           &event));
     event.Wait();
   }
 
   if (!socket_factory_.get()) {
     socket_factory_.reset(
         new content::IpcPacketSocketFactory(p2p_socket_dispatcher_));
   }
 
   if (!dependency_factory_->PeerConnectionFactoryCreated()) {
@@ skipping 12 matching lines @@
 }
 
 MediaStreamImpl::VideoRendererWrapper::VideoRendererWrapper() {}
 
 MediaStreamImpl::VideoRendererWrapper::~VideoRendererWrapper() {}
 
 void MediaStreamImpl::VideoRendererWrapper::SetVideoDecoder(
     RTCVideoDecoder* decoder) {
   rtc_video_decoder_ = decoder;
 }