Reland: Reorganize media::VideoCapture* types

content/browser/renderer_host/media/desktop_capture_device.h

 // Copyright (c) 2013 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_DESKTOP_CAPTURE_DEVICE_H_
 #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_DESKTOP_CAPTURE_DEVICE_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/common/content_export.h"
@@ skipping 20 matching lines @@
   // DesktopCaptureDevice for it. May return NULL in case of a failure (e.g. if
   // requested window was destroyed).
   static scoped_ptr<media::VideoCaptureDevice> Create(
       const DesktopMediaID& source);
 
   DesktopCaptureDevice(scoped_refptr<base::SequencedTaskRunner> task_runner,
                        scoped_ptr<webrtc::DesktopCapturer> desktop_capturer);
   virtual ~DesktopCaptureDevice();
 
   // VideoCaptureDevice interface.
-  virtual void AllocateAndStart(
-      const media::VideoCaptureCapability& capture_format,
-      scoped_ptr<Client> client) OVERRIDE;
+  virtual void AllocateAndStart(const media::VideoCaptureParams& params,
+                                scoped_ptr<Client> client) OVERRIDE;
   virtual void StopAndDeAllocate() OVERRIDE;
 
  private:
   class Core;
   scoped_refptr<Core> core_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopCaptureDevice);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_DESKTOP_CAPTURE_DEVICE_H_