Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor

media/capture/video/fake_video_capture_device_unittest.cc

 // Copyright 2014 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 "media/capture/video/fake_video_capture_device.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 103 matching lines @@
   double GetBufferPoolUtilization() const override { return 0.0; }
 
  private:
   base::Callback<void(const VideoCaptureFormat&)> frame_cb_;
 };
 
 class DeviceEnumerationListener
     : public base::RefCounted<DeviceEnumerationListener> {
  public:
   MOCK_METHOD1(OnEnumeratedDevicesCallbackPtr,
-               void(VideoCaptureDevice::Names* names));
+               void(VideoCaptureDeviceDescriptors* descriptors));
   // GMock doesn't support move-only arguments, so we use this forward method.
   void OnEnumeratedDevicesCallback(
-      std::unique_ptr<VideoCaptureDevice::Names> names) {
-    OnEnumeratedDevicesCallbackPtr(names.release());
+      std::unique_ptr<VideoCaptureDeviceDescriptors> descriptors) {
+    OnEnumeratedDevicesCallbackPtr(descriptors.release());
   }
 
  private:
   friend class base::RefCounted<DeviceEnumerationListener>;
   virtual ~DeviceEnumerationListener() {}
 };
 
 class ImageCaptureClient : public base::RefCounted<ImageCaptureClient> {
  public:
   // GMock doesn't support move-only arguments, so we use this forward method.
@@ skipping 52 matching lines @@
   void OnFrameCaptured(const VideoCaptureFormat& format) {
     last_format_ = format;
     run_loop_->QuitClosure().Run();
   }
 
   void WaitForCapturedFrame() {
     run_loop_.reset(new base::RunLoop());
     run_loop_->Run();
   }
 
-  std::unique_ptr<VideoCaptureDevice::Names> EnumerateDevices() {
-    VideoCaptureDevice::Names* names;
+  std::unique_ptr<VideoCaptureDeviceDescriptors> EnumerateDevices() {
+    VideoCaptureDeviceDescriptors* descriptors;
     EXPECT_CALL(*device_enumeration_listener_.get(),
-                OnEnumeratedDevicesCallbackPtr(_)).WillOnce(SaveArg<0>(&names));
+                OnEnumeratedDevicesCallbackPtr(_))
+        .WillOnce(SaveArg<0>(&descriptors));
 
-    video_capture_device_factory_->EnumerateDeviceNames(
+    video_capture_device_factory_->EnumerateDeviceDescriptors(
         base::Bind(&DeviceEnumerationListener::OnEnumeratedDevicesCallback,
                    device_enumeration_listener_));
     base::RunLoop().RunUntilIdle();
-    return std::unique_ptr<VideoCaptureDevice::Names>(names);
+    return std::unique_ptr<VideoCaptureDeviceDescriptors>(descriptors);
   }
 
   const VideoCaptureFormat& last_format() const { return last_format_; }
 
-  VideoCaptureDevice::Names names_;
+  VideoCaptureDeviceDescriptors descriptors_;
   const std::unique_ptr<base::MessageLoop> loop_;
   std::unique_ptr<base::RunLoop> run_loop_;
   std::unique_ptr<MockClient> client_;
   const scoped_refptr<DeviceEnumerationListener> device_enumeration_listener_;
   const scoped_refptr<ImageCaptureClient> image_capture_client_;
   VideoCaptureFormat last_format_;
   const std::unique_ptr<VideoCaptureDeviceFactory>
       video_capture_device_factory_;
 };
 
 class FakeVideoCaptureDeviceTest
     : public FakeVideoCaptureDeviceBase,
       public ::testing::WithParamInterface<
           ::testing::tuple<FakeVideoCaptureDevice::BufferOwnership, float>> {};
 
 struct CommandLineTestData {
   // Command line argument
   std::string argument;
   // Expected values
   float fps;
 };
 
 class FakeVideoCaptureDeviceCommandLineTest
     : public FakeVideoCaptureDeviceBase,
       public ::testing::WithParamInterface<CommandLineTestData> {};
 
 TEST_P(FakeVideoCaptureDeviceTest, CaptureUsing) {
-  const std::unique_ptr<VideoCaptureDevice::Names> names(EnumerateDevices());
-  ASSERT_FALSE(names->empty());
+  const std::unique_ptr<VideoCaptureDeviceDescriptors> descriptors(
+      EnumerateDevices());
+  ASSERT_FALSE(descriptors->empty());
 
   std::unique_ptr<VideoCaptureDevice> device(new FakeVideoCaptureDevice(
       testing::get<0>(GetParam()), testing::get<1>(GetParam())));
   ASSERT_TRUE(device);
 
   VideoCaptureParams capture_params;
   capture_params.requested_format.frame_size.SetSize(640, 480);
   capture_params.requested_format.frame_rate = testing::get<1>(GetParam());
   device->AllocateAndStart(capture_params, std::move(client_));
 
   WaitForCapturedFrame();
   EXPECT_EQ(last_format().frame_size.width(), 640);
   EXPECT_EQ(last_format().frame_size.height(), 480);
   EXPECT_EQ(last_format().frame_rate, testing::get<1>(GetParam()));
   device->StopAndDeAllocate();
 }
 
 INSTANTIATE_TEST_CASE_P(
     ,
     FakeVideoCaptureDeviceTest,
     Combine(Values(FakeVideoCaptureDevice::BufferOwnership::OWN_BUFFERS,
                    FakeVideoCaptureDevice::BufferOwnership::CLIENT_BUFFERS),
             Values(20, 29.97, 30, 50, 60)));
 
 TEST_F(FakeVideoCaptureDeviceTest, GetDeviceSupportedFormats) {
-  std::unique_ptr<VideoCaptureDevice::Names> names(EnumerateDevices());
+  std::unique_ptr<VideoCaptureDeviceDescriptors> descriptors(
+      EnumerateDevices());
 
-  VideoCaptureFormats supported_formats;
-
-  for (const auto& names_iterator : *names) {
-    video_capture_device_factory_->GetDeviceSupportedFormats(
-        names_iterator, &supported_formats);
+  for (const auto& descriptors_iterator : *descriptors) {
+    VideoCaptureFormats supported_formats;
+    video_capture_device_factory_->GetSupportedFormats(descriptors_iterator,
+                                                       &supported_formats);
     ASSERT_EQ(supported_formats.size(), 4u);
     EXPECT_EQ(supported_formats[0].frame_size.width(), 320);
     EXPECT_EQ(supported_formats[0].frame_size.height(), 240);
     EXPECT_EQ(supported_formats[0].pixel_format, PIXEL_FORMAT_I420);
     EXPECT_GE(supported_formats[0].frame_rate, 20.0);
     EXPECT_EQ(supported_formats[1].frame_size.width(), 640);
     EXPECT_EQ(supported_formats[1].frame_size.height(), 480);
     EXPECT_EQ(supported_formats[1].pixel_format, PIXEL_FORMAT_I420);
     EXPECT_GE(supported_formats[1].frame_rate, 20.0);
     EXPECT_EQ(supported_formats[2].frame_size.width(), 1280);
@@ skipping 103 matching lines @@
   device->TakePhoto(std::move(scoped_callback));
 
   run_loop_.reset(new base::RunLoop());
   run_loop_->Run();
   device->StopAndDeAllocate();
 }
 
 TEST_P(FakeVideoCaptureDeviceCommandLineTest, FrameRate) {
   base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       switches::kUseFakeDeviceForMediaStream, GetParam().argument);
-  const std::unique_ptr<VideoCaptureDevice::Names> names(EnumerateDevices());
-  ASSERT_FALSE(names->empty());
+  const std::unique_ptr<VideoCaptureDeviceDescriptors> descriptors(
+      EnumerateDevices());
+  ASSERT_FALSE(descriptors->empty());
 
-  for (const auto& names_iterator : *names) {
+  for (const auto& descriptors_iterator : *descriptors) {
     std::unique_ptr<VideoCaptureDevice> device =
-        video_capture_device_factory_->Create(names_iterator);
+        video_capture_device_factory_->CreateDevice(descriptors_iterator);
     ASSERT_TRUE(device);
 
     VideoCaptureParams capture_params;
     capture_params.requested_format.frame_size.SetSize(1280, 720);
     capture_params.requested_format.frame_rate = GetParam().fps;
     device->AllocateAndStart(capture_params, std::move(client_));
 
     WaitForCapturedFrame();
     EXPECT_EQ(last_format().frame_size.width(), 1280);
     EXPECT_EQ(last_format().frame_size.height(), 720);
     EXPECT_EQ(last_format().frame_rate, GetParam().fps);
     device->StopAndDeAllocate();
   }
 }
 
 INSTANTIATE_TEST_CASE_P(,
                         FakeVideoCaptureDeviceCommandLineTest,
                         Values(CommandLineTestData{"fps=-1", 5},
                                CommandLineTestData{"fps=29.97", 29.97f},
                                CommandLineTestData{"fps=60", 60},
                                CommandLineTestData{"fps=1000", 60}));
 };  // namespace media