Reland: Reorganize media::VideoCapture* types

content/renderer/media/video_capture_message_filter_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/shared_memory.h"
 #include "content/common/media/video_capture_messages.h"
 #include "content/renderer/media/video_capture_message_filter.h"
 #include "ipc/ipc_test_sink.h"
 #include "media/video/capture/video_capture_types.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
-using ::testing::AllOf;
 using ::testing::AnyNumber;
-using ::testing::Field;
 using ::testing::Mock;
 using ::testing::Return;
+using ::testing::SaveArg;
 using ::testing::StrictMock;
 
 namespace content {
 namespace {
 
 class MockVideoCaptureDelegate : public VideoCaptureMessageFilter::Delegate {
  public:
   MockVideoCaptureDelegate() : device_id_(0) {}
 
   // VideoCaptureMessageFilter::Delegate implementation.
@@ skipping 46 matching lines @@
 #endif
   EXPECT_CALL(delegate, OnBufferCreated(handle, 100, 1));
   filter->OnMessageReceived(VideoCaptureMsg_NewBuffer(
       delegate.device_id(), handle, 100, 1));
   Mock::VerifyAndClearExpectations(&delegate);
 
   // VideoCaptureMsg_BufferReady
   int buffer_id = 22;
   base::Time timestamp = base::Time::FromInternalValue(1);
 
-  media::VideoCaptureFormat format(234, 512, 30,
-      media::ConstantResolutionVideoCaptureDevice);
-  EXPECT_CALL(delegate, OnBufferReceived(buffer_id, timestamp,
-      AllOf(Field(&media::VideoCaptureFormat::width, 234),
-            Field(&media::VideoCaptureFormat::height, 512),
-            Field(&media::VideoCaptureFormat::frame_rate, 30))));
+  media::VideoCaptureFormat format(
+      gfx::Size(234, 512), 30, media::PIXEL_FORMAT_I420);
+  media::VideoCaptureFormat saved_format;
+  EXPECT_CALL(delegate, OnBufferReceived(buffer_id, timestamp, _))
+      .WillRepeatedly(SaveArg<2>(&saved_format));
   filter->OnMessageReceived(VideoCaptureMsg_BufferReady(
       delegate.device_id(), buffer_id, timestamp, format));
   Mock::VerifyAndClearExpectations(&delegate);
+  EXPECT_EQ(234, saved_format.frame_size.width());
+  EXPECT_EQ(512, saved_format.frame_size.height());
+  EXPECT_EQ(30, saved_format.frame_rate);
 
   // VideoCaptureMsg_FreeBuffer
   EXPECT_CALL(delegate, OnBufferDestroyed(buffer_id));
   filter->OnMessageReceived(VideoCaptureMsg_FreeBuffer(
       delegate.device_id(), buffer_id));
   Mock::VerifyAndClearExpectations(&delegate);
 }
 
 TEST(VideoCaptureMessageFilterTest, Delegates) {
   scoped_refptr<VideoCaptureMessageFilter> filter(
@@ skipping 29 matching lines @@
       VideoCaptureMsg_StateChanged(delegate1.device_id(),
                                    VIDEO_CAPTURE_STATE_ENDED));
 
   filter->RemoveDelegate(&delegate2);
   filter->OnMessageReceived(
       VideoCaptureMsg_StateChanged(delegate2.device_id(),
                                    VIDEO_CAPTURE_STATE_ENDED));
 }
 
 }  // namespace content