Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

media/video/capture/video_capture_device_unittest.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 "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/thread.h"
 #include "media/video/capture/fake_video_capture_device.h"
@@ skipping 21 matching lines @@
   MOCK_METHOD3(OnFrameInfo, void(int width, int height, int frame_rate));
 
   explicit MockFrameObserver(base::WaitableEvent* wait_event)
      : wait_event_(wait_event) {}
 
   virtual void OnError() OVERRIDE {
     OnErr();
   }
 
   virtual void OnFrameInfo(
-      const VideoCaptureDevice::Capability& info) OVERRIDE {
+      const VideoCaptureCapability& info) OVERRIDE {
     OnFrameInfo(info.width, info.height, info.frame_rate);
   }
 
   virtual void OnIncomingCapturedFrame(const uint8* data, int length,
                                        base::Time timestamp) OVERRIDE {
     wait_event_->Signal();
   }
 
  private:
   base::WaitableEvent* wait_event_;
@@ skipping 189 matching lines @@
   device->Allocate(640, 480, 30, frame_observer_.get());
 
   device->Start();
   EXPECT_TRUE(wait_event_.TimedWait(base::TimeDelta::FromMilliseconds(
       TestTimeouts::action_max_timeout_ms())));
   device->Stop();
   device->DeAllocate();
 }
 
 };  // namespace media