Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

media/video/capture/fake_video_capture_device.cc

 // 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.
 
 #include "media/video/capture/fake_video_capture_device.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 42 matching lines @@
 
 void FakeVideoCaptureDevice::Allocate(int width,
                                        int height,
                                        int frame_rate,
                                        EventHandler* observer) {
   if (state_ != kIdle) {
     return;  // Wrong state.
   }
 
   observer_ = observer;
-  Capability current_settings;
-  current_settings.color = kI420;
+  VideoCaptureCapability current_settings;
+  current_settings.color = VideoCaptureCapability::kI420;
+  current_settings.expected_capture_delay = 0;
+  current_settings.interlaced = false;
   if (width > 320) {  // VGA
     current_settings.width = 640;
     current_settings.height = 480;
     current_settings.frame_rate = 30;
   } else {  // QVGA
     current_settings.width = 320;
     current_settings.height = 240;
     current_settings.frame_rate = 30;
   }
 
@@ skipping 49 matching lines @@
                                      base::Time::Now());
   // Reschedule next CaptureTask.
   capture_thread_.message_loop()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&FakeVideoCaptureDevice::OnCaptureTask,
                    base::Unretained(this)),
         base::TimeDelta::FromMilliseconds(kFakeCaptureTimeoutMs));
 }
 
 }  // namespace media