Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

content/renderer/media/video_capture_impl_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/message_loop.h"
 #include "content/common/media/video_capture_messages.h"
 #include "content/renderer/media/video_capture_impl.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::AtLeast;
 using ::testing::Return;
 
-#define CAPABILITY_SMALL {176, 144, 30, media::VideoFrame::I420, 0, \
-    false }
-#define CAPABILITY_LARGE {320, 240, 30, media::VideoFrame::I420, 0, \
-    false }
+#define CAPABILITY_SMALL {176, 144, 30, media::VideoCaptureCapability::kI420, \
+    0, false }
+#define CAPABILITY_LARGE {320, 240, 30, media::VideoCaptureCapability::kI420, \
+    0, false }
 
 class MockVideoCaptureMessageFilter : public VideoCaptureMessageFilter {
  public:
   MockVideoCaptureMessageFilter() : VideoCaptureMessageFilter() {}
   virtual ~MockVideoCaptureMessageFilter() {}
 
   // Filter implementation.
   MOCK_METHOD1(Send, bool(IPC::Message* message));
 
  private:
@@ skipping 255 matching lines @@
       .WillOnce(Return());
   EXPECT_CALL(*client2, OnStopped(_))
       .WillOnce(Return());
   EXPECT_CALL(*client2, OnRemoved(_))
       .WillOnce(Return());
 
   video_capture_impl_->StopCapture(client1.get());
   video_capture_impl_->StopCapture(client2.get());
   message_loop_->RunAllPending();
 }