Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

content/browser/renderer_host/media/video_capture_controller.h

 // Copyright (c) 2011 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.
 
 // VideoCaptureController is the glue between VideoCaptureHost,
 // VideoCaptureManager and VideoCaptureDevice.
 // It provides functions for VideoCaptureHost to start a VideoCaptureDevice and
 // is responsible for keeping track of shared DIBs and filling them with I420
 // video frames for IPC communication between VideoCaptureHost and
 // VideoCaptureMessageFilter.
@@ skipping 54 matching lines @@
   void ReturnBuffer(const VideoCaptureControllerID& id,
                     VideoCaptureControllerEventHandler* event_handler,
                     int buffer_id);
 
   // Implement media::VideoCaptureDevice::EventHandler.
   virtual void OnIncomingCapturedFrame(const uint8* data,
                                        int length,
                                        base::Time timestamp) OVERRIDE;
   virtual void OnError() OVERRIDE;
   virtual void OnFrameInfo(
-      const media::VideoCaptureDevice::Capability& info) OVERRIDE;
+      const media::VideoCaptureCapability& info) OVERRIDE;
 
  private:
   struct ControllerClient;
   typedef std::list<ControllerClient*> ControllerClients;
 
   // Callback when manager has stopped device.
   void OnDeviceStopped();
 
   // Worker functions on IO thread.
   void DoIncomingCapturedFrameOnIOThread(int buffer_id, base::Time timestamp);
-  void DoFrameInfoOnIOThread(const media::VideoCaptureDevice::Capability info);
+  void DoFrameInfoOnIOThread(const media::VideoCaptureCapability info);
   void DoErrorOnIOThread();
   void DoDeviceStateOnIOThread(bool in_use);
   void DoDeviceStoppedOnIOThread();
 
   // Send frame info and init buffers to |client|.
   void SendFrameInfoAndBuffers(ControllerClient* client, int buffer_size);
 
   // Helpers.
   // Find a client of |id| and |handler| in |clients|.
   ControllerClient* FindClient(
@@ skipping 19 matching lines @@
   ControllerClients controller_clients_;
 
   // All clients waiting for service.
   ControllerClients pending_clients_;
 
   // The parameter that currently used for the capturing.
   media::VideoCaptureParams current_params_;
 
   // It's modified on caller thread, assuming there is only one OnFrameInfo()
   // call per StartCapture().
-  media::VideoCaptureDevice::Capability frame_info_;
+  media::VideoCaptureCapability frame_info_;
 
   // It's accessed only on IO thread.
   bool frame_info_available_;
 
   media_stream::VideoCaptureManager* video_capture_manager_;
 
   bool device_in_use_;
   video_capture::State state_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureController);
 };
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_CONTROLLER_H_