Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

content/browser/renderer_host/media/video_capture_manager_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.
 
 // Unit test for VideoCaptureManager.
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
@@ skipping 47 matching lines @@
 };  // class MockMediaStreamProviderListener
 
 }  // namespace media_stream
 
 namespace {
 
 // Needed as an input argument to Start().
 class MockFrameObserver: public media::VideoCaptureDevice::EventHandler {
  public:
   virtual void OnError() {}
-  void OnFrameInfo(const media::VideoCaptureDevice::Capability& info) {}
+  void OnFrameInfo(const media::VideoCaptureCapability& info) {}
   virtual void OnIncomingCapturedFrame(const uint8* data, int length,
                                        base::Time timestamp) {}
 };
 
 // Test class
 class VideoCaptureManagerTest : public testing::Test {
  public:
   VideoCaptureManagerTest()
       : vcm_(),
         listener_(),
@@ skipping 241 matching lines @@
   // VideoCaptureManager destructor otherwise.
   vcm_->Close(video_session_id);
   vcm_->Stop(video_session_id, base::Closure());
 
   // Wait to check callbacks before removing the listener
   SyncWithVideoCaptureManagerThread();
   vcm_->Unregister();
 }
 
 }  // namespace