Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

content/browser/renderer_host/media/video_capture_controller.h

Index: content/browser/renderer_host/media/video_capture_controller.h
diff --git a/content/browser/renderer_host/media/video_capture_controller.h b/content/browser/renderer_host/media/video_capture_controller.h
index 2faa29d362431a6bab4f90e686e30aa0f383f304..27f149fd558fc9ee0fe140632d2556b125212fe7 100644
--- a/content/browser/renderer_host/media/video_capture_controller.h
+++ b/content/browser/renderer_host/media/video_capture_controller.h
@@ -72,7 +72,7 @@ class VideoCaptureController
                                        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;
@@ -83,7 +83,7 @@ class VideoCaptureController
 
   // 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();
@@ -123,7 +123,7 @@ class VideoCaptureController
 
   // 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_;