[Mojo Video Capture] Switch to using Mojo structs in media/capture/mojo

services/video_capture/test/fake_device_unittest.cc

 // Copyright 2016 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/ref_counted.h"
 #include "base/run_loop.h"
 #include "media/base/video_frame.h"
 #include "media/mojo/common/media_type_converters.h"
-#include "services/video_capture/public/cpp/capture_settings.h"
+#include "services/video_capture/device_media_to_mojo_adapter.h"
 #include "services/video_capture/public/interfaces/device_factory.mojom.h"
 #include "services/video_capture/test/fake_device_test.h"
 #include "services/video_capture/test/mock_receiver.h"
 
 using testing::_;
+using testing::AtLeast;

[emircan, 2017/04/17 21:02:12]

I don't see AtLeast being used here.

 using testing::Invoke;
 using testing::InvokeWithoutArgs;
 
 namespace {
 
 struct FrameInfo {
   gfx::Size size;
   media::VideoPixelFormat pixel_format;
   media::VideoFrame::StorageType storage_type;
-  bool is_mappable;
   base::TimeDelta timestamp;
 };
 
 }  // anonymous namespace
 
 namespace video_capture {
 
 // This alias ensures test output is easily attributed to this service's tests.
 // TODO(rockot/chfremer): Consider just renaming the type.
 using FakeVideoCaptureDeviceTest = FakeDeviceTest;
@@ skipping 36 matching lines @@
   EXPECT_CALL(receiver, OnIncomingCapturedVideoFramePtr(_))
       .WillRepeatedly(Invoke(
           [&received_frame_infos, &received_frame_count, &wait_loop]
           (const media::mojom::VideoFramePtr* frame) {
             if (received_frame_count >= num_frames_to_receive)
               return;
             auto video_frame = frame->To<scoped_refptr<media::VideoFrame>>();
             auto& frame_info = received_frame_infos[received_frame_count];
             frame_info.pixel_format = video_frame->format();
             frame_info.storage_type = video_frame->storage_type();
-            frame_info.is_mappable = video_frame->IsMappable();
             frame_info.size = video_frame->natural_size();
             frame_info.timestamp = video_frame->timestamp();
             received_frame_count += 1;
             if (received_frame_count == num_frames_to_receive)
               wait_loop.Quit();
           }));
 
   fake_device_proxy_->Start(requestable_settings_, std::move(receiver_proxy));
 
   wait_loop.Run();
 
   base::TimeDelta previous_timestamp;
   for (int i = 0; i < num_frames_to_receive; i++) {
     auto& frame_info = received_frame_infos[i];
     // Service is expected to always output I420
     EXPECT_EQ(media::PIXEL_FORMAT_I420, frame_info.pixel_format);
     // Service is expected to always use STORAGE_MOJO_SHARED_BUFFER
     EXPECT_EQ(media::VideoFrame::STORAGE_MOJO_SHARED_BUFFER,
               frame_info.storage_type);
-    EXPECT_TRUE(frame_info.is_mappable);
-    EXPECT_EQ(requestable_settings_.format.frame_size, frame_info.size);
     // Timestamps are expected to increase
     if (i > 0)
       EXPECT_GT(frame_info.timestamp, previous_timestamp);
     previous_timestamp = frame_info.timestamp;
   }
 }
 
 }  // namespace video_capture