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..8b579ab4902aeb3548a18ca9869219611d7b932e 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
@@ -27,21 +27,20 @@ class RenderWidgetHost;
 // WebContentsVideoCaptureDevice will capture from whatever render view is
 // currently associated with that WebContents instance.  This allows the
 // underlying render view to be swapped out (e.g., due to navigation or
-// crashes/reloads), without any interrpution in capturing.
+// crashes/reloads), without any interruption in capturing.
 class CONTENT_EXPORT WebContentsVideoCaptureDevice
     : public media::VideoCaptureDevice {
  public:
-  // Construct from the a |device_id| string of the form:
-  //   "render_process_id:render_view_id"
-  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.
+  // Construct from a |device_id| string of the form:
+  //   "virtual-media-stream://render_process_id:render_view_id", where
+  // |render_process_id| and |render_view_id| are decimal integers.
+  // |destroy_cb| is invoked on an outside thread once all outstanding objects
+  // are completely destroyed -- this will be some time after the
+  // WebContentsVideoCaptureDevice is itself deleted.
   // TODO(miu): Passing a destroy callback suggests needing to revisit the
   // design philosophy of an asynchronous DeAllocate().  http://crbug.com/158641
-  static media::VideoCaptureDevice* CreateForTesting(
-      RenderWidgetHost* test_source, const base::Closure& destroy_cb);
+  static media::VideoCaptureDevice* Create(const std::string& device_id,
+                                           const base::Closure& destroy_cb);
 
   virtual ~WebContentsVideoCaptureDevice();
 
@@ -61,10 +60,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,
+  WebContentsVideoCaptureDevice(const Name& name,
+                                int render_process_id,
+                                int render_view_id,
                                 const base::Closure& destroy_cb);
 
   Name device_name_;