ImageCapture: separate fillLightMode, redEyeReduction and Torch

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 407 matching lines @@
 
   EXPECT_CALL(*image_capture_client_.get(), OnCorrectGetPhotoCapabilities())
       .Times(1);
   device->GetPhotoCapabilities(std::move(scoped_get_callback));
   run_loop_.reset(new base::RunLoop());
   run_loop_->Run();
 
   const mojom::PhotoCapabilities* capabilities =
       image_capture_client_->capabilities();
   ASSERT_TRUE(capabilities);
+  EXPECT_EQ(mojom::MeteringMode::NONE, capabilities->white_balance_mode);
+  EXPECT_EQ(mojom::MeteringMode::NONE, capabilities->exposure_mode);
+  EXPECT_EQ(mojom::MeteringMode::NONE, capabilities->focus_mode);
+
+  EXPECT_EQ(0, capabilities->exposure_compensation->min);
+  EXPECT_EQ(0, capabilities->exposure_compensation->max);
+  EXPECT_EQ(0, capabilities->exposure_compensation->current);
+  EXPECT_EQ(0, capabilities->exposure_compensation->step);
+  EXPECT_EQ(0, capabilities->color_temperature->min);
+  EXPECT_EQ(0, capabilities->color_temperature->max);
+  EXPECT_EQ(0, capabilities->color_temperature->current);
+  EXPECT_EQ(0, capabilities->color_temperature->step);
   EXPECT_EQ(100, capabilities->iso->min);
   EXPECT_EQ(100, capabilities->iso->max);
   EXPECT_EQ(100, capabilities->iso->current);
   EXPECT_EQ(0, capabilities->iso->step);
-  EXPECT_EQ(capture_params.requested_format.frame_size.height(),
-            capabilities->height->current);
-  EXPECT_EQ(96, capabilities->height->min);
-  EXPECT_EQ(1080, capabilities->height->max);
-  EXPECT_EQ(1, capabilities->height->step);
-  EXPECT_EQ(capture_params.requested_format.frame_size.width(),
-            capabilities->width->current);
-  EXPECT_EQ(96, capabilities->width->min);
-  EXPECT_EQ(1920, capabilities->width->max);
-  EXPECT_EQ(1, capabilities->width->step);
-  EXPECT_EQ(100, capabilities->zoom->min);
-  EXPECT_EQ(400, capabilities->zoom->max);
-  EXPECT_EQ(1, capabilities->zoom->step);
-  EXPECT_GE(capabilities->zoom->current, capabilities->zoom->min);
-  EXPECT_GE(capabilities->zoom->max, capabilities->zoom->current);
-  EXPECT_EQ(mojom::MeteringMode::NONE, capabilities->focus_mode);
-  EXPECT_EQ(mojom::MeteringMode::NONE, capabilities->exposure_mode);
-  EXPECT_EQ(0, capabilities->exposure_compensation->min);
-  EXPECT_EQ(0, capabilities->exposure_compensation->max);
-  EXPECT_EQ(0, capabilities->exposure_compensation->current);
-  EXPECT_EQ(0, capabilities->exposure_compensation->step);
-  EXPECT_EQ(mojom::MeteringMode::NONE, capabilities->white_balance_mode);
-  EXPECT_EQ(mojom::FillLightMode::NONE, capabilities->fill_light_mode);
-  EXPECT_FALSE(capabilities->red_eye_reduction);
-  EXPECT_EQ(0, capabilities->color_temperature->min);
-  EXPECT_EQ(0, capabilities->color_temperature->max);
-  EXPECT_EQ(0, capabilities->color_temperature->current);
-  EXPECT_EQ(0, capabilities->color_temperature->step);
+
   EXPECT_EQ(0, capabilities->brightness->min);
   EXPECT_EQ(0, capabilities->brightness->max);
   EXPECT_EQ(0, capabilities->brightness->current);
   EXPECT_EQ(0, capabilities->brightness->step);
   EXPECT_EQ(0, capabilities->contrast->min);
   EXPECT_EQ(0, capabilities->contrast->max);
   EXPECT_EQ(0, capabilities->contrast->current);
   EXPECT_EQ(0, capabilities->contrast->step);
   EXPECT_EQ(0, capabilities->saturation->min);
   EXPECT_EQ(0, capabilities->saturation->max);
   EXPECT_EQ(0, capabilities->saturation->current);
   EXPECT_EQ(0, capabilities->saturation->step);
   EXPECT_EQ(0, capabilities->sharpness->min);
   EXPECT_EQ(0, capabilities->sharpness->max);
   EXPECT_EQ(0, capabilities->sharpness->current);
   EXPECT_EQ(0, capabilities->sharpness->step);
 
+  EXPECT_FALSE(capabilities->torch);
+
+  EXPECT_EQ(mojom::RedEyeReduction::NEVER, capabilities->red_eye_reduction);
+  EXPECT_EQ(capture_params.requested_format.frame_size.height(),
+            capabilities->height->current);
+  EXPECT_EQ(96, capabilities->height->min);
+  EXPECT_EQ(1080, capabilities->height->max);
+  EXPECT_EQ(1, capabilities->height->step);
+  EXPECT_EQ(capture_params.requested_format.frame_size.width(),
+            capabilities->width->current);
+  EXPECT_EQ(96, capabilities->width->min);
+  EXPECT_EQ(1920, capabilities->width->max);
+  EXPECT_EQ(1, capabilities->width->step);
+  EXPECT_EQ(100, capabilities->zoom->min);
+  EXPECT_EQ(400, capabilities->zoom->max);
+  EXPECT_EQ(1, capabilities->zoom->step);
+  EXPECT_GE(capabilities->zoom->current, capabilities->zoom->min);
+  EXPECT_GE(capabilities->zoom->max, capabilities->zoom->current);
+  EXPECT_TRUE(capabilities->fill_light_mode.empty());
+
   // Set options: zoom to the maximum value.
   const int max_zoom_value = capabilities->zoom->max;
   VideoCaptureDevice::SetPhotoOptionsCallback scoped_set_callback(
       base::Bind(&ImageCaptureClient::OnCorrectSetPhotoOptions,
                  image_capture_client_),
       base::Bind(&ImageCaptureClient::OnSetPhotoOptionsFailure,
                  image_capture_client_));
 
   mojom::PhotoSettingsPtr settings = mojom::PhotoSettings::New();
   settings->zoom = max_zoom_value;
@@ skipping 152 matching lines @@
                                4u,
                                {PIXEL_FORMAT_I420, PIXEL_FORMAT_Y16,
                                 PIXEL_FORMAT_MJPEG, PIXEL_FORMAT_I420}},
            CommandLineTestData{"device-count=4,ownership=client",
                                20,
                                4u,
                                {PIXEL_FORMAT_I420, PIXEL_FORMAT_Y16,
                                 PIXEL_FORMAT_MJPEG, PIXEL_FORMAT_I420}},
            CommandLineTestData{"device-count=0", 20, 0u, {PIXEL_FORMAT_I420}}));
 };  // namespace media