Refactor VideoCaptureManager::GetDeviceFormatsInUse()

content/browser/renderer_host/media/video_capture_manager_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.
 
 // Unit test for VideoCaptureManager.
 
 #include "content/browser/renderer_host/media/video_capture_manager.h"
 
 #include <stdint.h>
 
@@ skipping 590 matching lines @@
 // use is an empty vector.
 TEST_F(VideoCaptureManagerTest,
        StartDeviceAndGetDeviceFormatInUseWithDeviceId) {
   std::string device_id = devices_.front().device.id;
   InSequence s;
   EXPECT_CALL(*listener_, Opened(MEDIA_DEVICE_VIDEO_CAPTURE, _));
   int video_session_id = vcm_->Open(devices_.front().device);
   base::RunLoop().RunUntilIdle();
 
   // Right after opening the device, we should see no format in use.
-  media::VideoCaptureFormats formats_in_use;
-  EXPECT_TRUE(vcm_->GetDeviceFormatsInUse(MEDIA_DEVICE_VIDEO_CAPTURE, device_id,
-                                          &formats_in_use));
-  EXPECT_TRUE(formats_in_use.empty());
+  EXPECT_EQ(base::nullopt,
+            vcm_->GetDeviceFormatInUse(MEDIA_DEVICE_VIDEO_CAPTURE, device_id));
 
   EXPECT_CALL(*frame_observer_, OnStarted(_));
   VideoCaptureControllerID client_id = StartClient(video_session_id, true);
   base::RunLoop().RunUntilIdle();
-  // After StartClient(), |formats_in_use| should contain one valid format.
-  EXPECT_TRUE(vcm_->GetDeviceFormatsInUse(MEDIA_DEVICE_VIDEO_CAPTURE, device_id,
-                                          &formats_in_use));
-  EXPECT_EQ(formats_in_use.size(), 1u);
-  if (formats_in_use.size()) {
-    media::VideoCaptureFormat& format_in_use = formats_in_use.front();
-    EXPECT_TRUE(format_in_use.IsValid());
-    EXPECT_GT(format_in_use.frame_size.width(), 1);
-    EXPECT_GT(format_in_use.frame_size.height(), 1);
-    EXPECT_GT(format_in_use.frame_rate, 1);
-  }
-  formats_in_use.clear();
+  // After StartClient(), device's format in use should be valid.
+  base::Optional<media::VideoCaptureFormat> format_in_use =
+      vcm_->GetDeviceFormatInUse(MEDIA_DEVICE_VIDEO_CAPTURE, device_id);
+  EXPECT_TRUE(format_in_use.has_value());
+  EXPECT_TRUE(format_in_use->IsValid());
+  EXPECT_GT(format_in_use->frame_size.width(), 1);
+  EXPECT_GT(format_in_use->frame_size.height(), 1);
+  EXPECT_GT(format_in_use->frame_rate, 1);
 
   EXPECT_CALL(*listener_, Closed(MEDIA_DEVICE_VIDEO_CAPTURE, _));
   StopClient(client_id);
   base::RunLoop().RunUntilIdle();
-  // After StopClient(), the device's formats in use should be empty again.
-  EXPECT_TRUE(vcm_->GetDeviceFormatsInUse(MEDIA_DEVICE_VIDEO_CAPTURE, device_id,
-                                          &formats_in_use));
-  EXPECT_TRUE(formats_in_use.empty());
+  // After StopClient(), the device's format in use should be empty again.
+  EXPECT_EQ(base::nullopt,
+            vcm_->GetDeviceFormatInUse(MEDIA_DEVICE_VIDEO_CAPTURE, device_id));
 
   vcm_->Close(video_session_id);
   base::RunLoop().RunUntilIdle();
   vcm_->UnregisterListener(listener_.get());
 }
 
 // Open two different devices.
 TEST_F(VideoCaptureManagerTest, OpenTwo) {
   InSequence s;
   EXPECT_CALL(*listener_, Opened(MEDIA_DEVICE_VIDEO_CAPTURE, _)).Times(2);
@@ skipping 138 matching lines @@
   // Wait to check callbacks before removing the listener.
   base::RunLoop().RunUntilIdle();
   vcm_->UnregisterListener(listener_.get());
 }
 #endif
 
 // TODO(mcasas): Add a test to check consolidation of the supported formats
 // provided by the device when http://crbug.com/323913 is closed.
 
 }  // namespace content