Move VideoCapture::VideoCaptureCapability to video_capture_types.h

content/renderer/media/capture_video_decoder_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/bind.h"
 #include "content/renderer/media/capture_video_decoder.h"
 #include "content/renderer/media/video_capture_impl.h"
 #include "content/renderer/media/video_capture_impl_manager.h"
 #include "media/base/filters.h"
 #include "media/base/limits.h"
@@ skipping 39 matching lines @@
  public:
   MockVideoCaptureImpl(const media::VideoCaptureSessionId id,
                        scoped_refptr<base::MessageLoopProxy> ml_proxy,
                        VideoCaptureMessageFilter* filter)
       : VideoCaptureImpl(id, ml_proxy, filter) {
   }
   virtual ~MockVideoCaptureImpl() {}
 
   MOCK_METHOD2(StartCapture,
                void(media::VideoCapture::EventHandler* handler,
-                    const VideoCaptureCapability& capability));
+                    const media::VideoCaptureCapability& capability));
   MOCK_METHOD1(StopCapture, void(media::VideoCapture::EventHandler* handler));
   MOCK_METHOD1(FeedBuffer, void(scoped_refptr<VideoFrameBuffer> buffer));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockVideoCaptureImpl);
 };
 
 class MockVideoCaptureImplManager : public VideoCaptureImplManager {
  public:
   MockVideoCaptureImplManager() {}
@@ skipping 10 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(MockVideoCaptureImplManager);
 };
 
 class CaptureVideoDecoderTest : public ::testing::Test {
  protected:
   CaptureVideoDecoderTest() {
     message_loop_.reset(new MessageLoop(MessageLoop::TYPE_IO));
     message_loop_proxy_ =
         base::MessageLoopProxy::current().get();
     vc_manager_ = new MockVideoCaptureImplManager();
-    media::VideoCapture::VideoCaptureCapability capability;
+    media::VideoCaptureCapability capability;
     capability.width = kWidth;
     capability.height = kHeight;
-    capability.max_fps = kFPS;
+    capability.frame_rate = kFPS;
     capability.expected_capture_delay = 0;
-    capability.raw_type = media::VideoFrame::I420;
+    capability.color = media::VideoFrame::I420;
     capability.interlaced = false;
 
     decoder_ = new CaptureVideoDecoder(message_loop_proxy_,
                                        kVideoStreamId, vc_manager_, capability);
     decoder_->set_host(&host_);
     EXPECT_CALL(statistics_cb_object_, OnStatistics(_))
         .Times(AnyNumber());
 
     read_cb_ = base::Bind(&CaptureVideoDecoderTest::FrameReady,
                           base::Unretained(this));
@@ skipping 103 matching lines @@
   params.session_id = kVideoStreamId;
 
   decoder_->OnDeviceInfoReceived(vc_impl_.get(), params);
   message_loop_->RunAllPending();
 
   EXPECT_EQ(expected_size.width(), decoder_->natural_size().width());
   EXPECT_EQ(expected_size.height(), decoder_->natural_size().height());
 
   Stop();
 }