Make VideoCaptureController single-threaded and not ref counted.

content/browser/renderer_host/media/video_capture_host.h

 // 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.
 //
 // VideoCaptureHost serves video capture related messages from
 // VideoCaptureMessageFilter which lives inside the render process.
 //
 // This class is owned by BrowserRenderProcessHost, and instantiated on UI
 // thread, but all other operations and method calls happen on IO thread.
 //
@@ skipping 21 matching lines @@
 //      | < VideoCaptureMsg_StateChanged      |
 //      |         (kStopped)                  |
 //      v                                     v
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_HOST_H_
 #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_HOST_H_
 
 #include <map>
 
 #include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
 #include "base/sequenced_task_runner_helpers.h"
 #include "content/browser/renderer_host/media/video_capture_controller.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/browser_message_filter.h"
 #include "ipc/ipc_message.h"
 
 namespace media {
 class VideoCaptureCapability;
 }
 
@@ skipping 38 matching lines @@
   virtual ~VideoCaptureHost();
 
   // IPC message: Start capture on the VideoCaptureDevice referenced by
   // VideoCaptureParams::session_id. |device_id| is an id created by
   // VideoCaptureMessageFilter to identify a session
   // between a VideoCaptureMessageFilter and a VideoCaptureHost.
   void OnStartCapture(int device_id,
                       const media::VideoCaptureParams& params);
   void OnControllerAdded(
       int device_id, const media::VideoCaptureParams& params,
-      VideoCaptureController* controller);
+      const base::WeakPtr<VideoCaptureController>& controller);
   void DoControllerAddedOnIOThread(
       int device_id, const media::VideoCaptureParams params,
-      VideoCaptureController* controller);
+      const base::WeakPtr<VideoCaptureController>& controller);
 
   // IPC message: Stop capture on device referenced by |device_id|.
   void OnStopCapture(int device_id);
 
   // IPC message: Pause capture on device referenced by |device_id|.
   void OnPauseCapture(int device_id);
 
   // IPC message: Receive an empty buffer from renderer. Send it to device
   // referenced by |device_id|.
   void OnReceiveEmptyBuffer(int device_id, int buffer_id);
@@ skipping 27 matching lines @@
   // Handle error coming from VideoCaptureDevice.
   void DoHandleErrorOnIOThread(const VideoCaptureControllerID& controller_id);
 
   void DoEndedOnIOThread(const VideoCaptureControllerID& controller_id);
 
   void DeleteVideoCaptureControllerOnIOThread(
       const VideoCaptureControllerID& controller_id);
 
   MediaStreamManager* media_stream_manager_;
 
-  struct Entry;
-  typedef std::map<VideoCaptureControllerID, Entry*> EntryMap;
-  // A map of VideoCaptureControllerID to its state and VideoCaptureController.
+  typedef std::map<VideoCaptureControllerID,
+                   base::WeakPtr<VideoCaptureController> > EntryMap;
+
+  // A map of VideoCaptureControllerID to the VideoCaptureController to which
+  // it is connected. An entry in this map temporarily has holds a null

[Ami GONE FROM CHROMIUM, 2013/09/14 00:32:24]

has holds

[ncarter (slow), 2013/09/14 01:29:31]

Done.

+  // controller while it is in the process of starting.
   EntryMap entries_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_HOST_H_