Rewrite WebContentsVideoCaptureDeviceTest.

content/browser/renderer_host/media/web_contents_video_capture_device.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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_WEB_CONTENTS_VIDEO_CAPTURE_DEVICE_H_
 #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_WEB_CONTENTS_VIDEO_CAPTURE_DEVICE_H_
 
 #include <string>
 
 #include "base/callback_forward.h"
@@ skipping 14 matching lines @@
 // routing ID for a RenderViewHost, and from the RenderViewHost instance, a
 // reference to its associated WebContents instance is acquired.  From then on,
 // 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.
 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.
   virtual void Allocate(int width,
                         int height,
                         int frame_rate,
                         VideoCaptureDevice::EventHandler* consumer) OVERRIDE;
   virtual void Start() OVERRIDE;
   virtual void Stop() OVERRIDE;
   virtual void DeAllocate() OVERRIDE;
 
   // Note: The following is just a pass-through of the device_id provided to the
   // constructor.  It does not change when the content of the page changes
   // (e.g., due to navigation), or when the underlying RenderView is
   // swapped-out.
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentsVideoCaptureDevice);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_WEB_CONTENTS_VIDEO_CAPTURE_DEVICE_H_