Rewrite WebContentsVideoCaptureDeviceTest.

content/browser/renderer_host/media/web_contents_video_capture_device.h

Index: content/browser/renderer_host/media/web_contents_video_capture_device.h
diff --git a/content/browser/renderer_host/media/web_contents_video_capture_device.h b/content/browser/renderer_host/media/web_contents_video_capture_device.h
index 45d4c59a20960adb65c11707e9945be09885e730..b4419ce5f5dfe232d7f582e4e34872c99fb53af5 100644
--- a/content/browser/renderer_host/media/web_contents_video_capture_device.h
+++ b/content/browser/renderer_host/media/web_contents_video_capture_device.h
@@ -32,17 +32,10 @@ class CONTENT_EXPORT WebContentsVideoCaptureDevice
     : public media::VideoCaptureDevice {
  public:
   // Construct from the a |device_id| string of the form:
-  //   "render_process_id:render_view_id"
+  //   "virtual-media-stream://render_process_id:render_view_id", where
+  // |render_process_id| and |render_view_id| are decimal integers.
   static media::VideoCaptureDevice* Create(const std::string& device_id);
 
-  // Construct an instance with the following |test_source| injected for testing
-  // purposes.  |destroy_cb| is invoked once all outstanding objects are
-  // completely destroyed.
-  // TODO(miu): Passing a destroy callback suggests needing to revisit the
-  // design philosophy of an asynchronous DeAllocate().  http://crbug.com/158641

[miu, 2013/02/20 06:45:10]

Should 158641 be added to the BUG= line in the description?

[ncarter (slow), 2013/02/22 02:16:11]

Done. Also, revived the TODO because it looks like the destroy_cb is here to
stay.

-  static media::VideoCaptureDevice* CreateForTesting(
-      RenderWidgetHost* test_source, const base::Closure& destroy_cb);
-
   virtual ~WebContentsVideoCaptureDevice();
 
   // VideoCaptureDevice implementation.
@@ -61,11 +54,9 @@ class CONTENT_EXPORT WebContentsVideoCaptureDevice
   virtual const Name& device_name() OVERRIDE;
 
  private:
-  // Constructors.  The latter is used for testing.
-  WebContentsVideoCaptureDevice(
-      const Name& name, int render_process_id, int render_view_id);
-  WebContentsVideoCaptureDevice(RenderWidgetHost* test_source,
-                                const base::Closure& destroy_cb);
+  WebContentsVideoCaptureDevice(const Name& name,
+                                int render_process_id,
+                                int render_view_id);
 
   Name device_name_;
   scoped_refptr<CaptureMachine> capturer_;