Consolidate duplicated frame / capability structures in video_capture_types.h

content/browser/renderer_host/media/desktop_capture_device_unittest.cc

 // Copyright (c) 2013 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 "content/browser/renderer_host/media/desktop_capture_device.h"
 
 #include "base/basictypes.h"
 #include "base/sequenced_task_runner.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_timeouts.h"
@@ skipping 114 matching lines @@
   EXPECT_CALL(frame_observer, OnFrameInfo(_))
       .WillOnce(SaveArg<0>(&caps));
   EXPECT_CALL(frame_observer, OnError())
       .Times(0);
   EXPECT_CALL(frame_observer, OnIncomingCapturedFrame(_, _, _, _, _, _))
       .WillRepeatedly(DoAll(
           SaveArg<1>(&frame_size),
           InvokeWithoutArgs(&done_event, &base::WaitableEvent::Signal)));
 
   media::VideoCaptureCapability capture_format(
-      640, 480, kFrameRate, media::VideoCaptureCapability::kI420, 0, false,
+      640, 480, kFrameRate, media::kI420, 0, false,
       media::ConstantResolutionVideoCaptureDevice);
   capture_device.Allocate(capture_format, &frame_observer);
   capture_device.Start();
   EXPECT_TRUE(done_event.TimedWait(TestTimeouts::action_max_timeout()));
   capture_device.Stop();
   capture_device.DeAllocate();
 
   EXPECT_GT(caps.width, 0);
   EXPECT_GT(caps.height, 0);
   EXPECT_EQ(kFrameRate, caps.frame_rate);
-  EXPECT_EQ(media::VideoCaptureCapability::kARGB, caps.color);
+  EXPECT_EQ(media::kARGB, caps.color);
   EXPECT_FALSE(caps.interlaced);
 
   EXPECT_EQ(caps.width * caps.height * 4, frame_size);
 }
 
 // Test that screen capturer behaves correctly if the source frame size changes
 // but the caller cannot cope with variable resolution output.
 TEST_F(DesktopCaptureDeviceTest, ScreenResolutionChangeConstantResolution) {
   FakeScreenCapturer* mock_capturer = new FakeScreenCapturer();
 
@@ skipping 15 matching lines @@
   EXPECT_CALL(frame_observer, OnIncomingCapturedFrame(_, _, _, _, _, _))
       .After(frame_info_called)
       .WillRepeatedly(DoAll(
           SaveArg<1>(&frame_size),
           InvokeWithoutArgs(&done_event, &base::WaitableEvent::Signal)));
 
   media::VideoCaptureCapability capture_format(
       kTestFrameWidth1,
       kTestFrameHeight1,
       kFrameRate,
-      media::VideoCaptureCapability::kI420,
+      media::kI420,
       0,
       false,
       media::ConstantResolutionVideoCaptureDevice);
 
   capture_device.Allocate(capture_format, &frame_observer);
   capture_device.Start();
 
   // Capture at least two frames, to ensure that the source frame size has
   // changed while capturing.
   EXPECT_TRUE(done_event.TimedWait(TestTimeouts::action_max_timeout()));
   done_event.Reset();
   EXPECT_TRUE(done_event.TimedWait(TestTimeouts::action_max_timeout()));
 
   capture_device.Stop();
   capture_device.DeAllocate();
 
   EXPECT_EQ(kTestFrameWidth1, caps.width);
   EXPECT_EQ(kTestFrameHeight1, caps.height);
   EXPECT_EQ(kFrameRate, caps.frame_rate);
-  EXPECT_EQ(media::VideoCaptureCapability::kARGB, caps.color);
+  EXPECT_EQ(media::kARGB, caps.color);
   EXPECT_FALSE(caps.interlaced);
 
   EXPECT_EQ(caps.width * caps.height * 4, frame_size);
 }
 
 // Test that screen capturer behaves correctly if the source frame size changes
 // and the caller can cope with variable resolution output.
 TEST_F(DesktopCaptureDeviceTest, ScreenResolutionChangeVariableResolution) {
   FakeScreenCapturer* mock_capturer = new FakeScreenCapturer();
 
@@ skipping 22 matching lines @@
       .Times(0);
   EXPECT_CALL(frame_observer, OnIncomingCapturedFrame(_, _, _, _, _, _))
       .After(frame_info_called)
       .WillRepeatedly(
           InvokeWithoutArgs(&done_event, &base::WaitableEvent::Signal));
 
   media::VideoCaptureCapability capture_format(
       kTestFrameWidth2,
       kTestFrameHeight2,
       kFrameRate,
-      media::VideoCaptureCapability::kI420,
+      media::kI420,
       0,
       false,
       media::VariableResolutionVideoCaptureDevice);
 
   capture_device.Allocate(capture_format, &frame_observer);
   capture_device.Start();
 
   // Capture at least three frames, to ensure that the source frame size has
   // changed at least twice while capturing.
   EXPECT_TRUE(done_event.TimedWait(TestTimeouts::action_max_timeout()));
   done_event.Reset();
   EXPECT_TRUE(done_event.TimedWait(TestTimeouts::action_max_timeout()));
   done_event.Reset();
   EXPECT_TRUE(done_event.TimedWait(TestTimeouts::action_max_timeout()));
 
   capture_device.Stop();
   capture_device.DeAllocate();
 
   EXPECT_EQ(kTestFrameWidth1, caps.width);
   EXPECT_EQ(kTestFrameHeight1, caps.height);
   EXPECT_EQ(kFrameRate, caps.frame_rate);
-  EXPECT_EQ(media::VideoCaptureCapability::kARGB, caps.color);
+  EXPECT_EQ(media::kARGB, caps.color);
   EXPECT_FALSE(caps.interlaced);
 }
 
 }  // namespace content