ImageCapture: separate fillLightMode, redEyeReduction and Torch

media/capture/video/fake_video_capture_device_unittest.cc

Index: media/capture/video/fake_video_capture_device_unittest.cc
diff --git a/media/capture/video/fake_video_capture_device_unittest.cc b/media/capture/video/fake_video_capture_device_unittest.cc
index d84b01697f51fad3532ad2dd9b95cc3de8e66afb..fd52e19b54e3d65aad3c5ffbfd241cde6a969948 100644
--- a/media/capture/video/fake_video_capture_device_unittest.cc
+++ b/media/capture/video/fake_video_capture_device_unittest.cc
@@ -425,38 +425,23 @@ TEST_F(FakeVideoCaptureDeviceTest, GetAndSetCapabilities) {
   const mojom::PhotoCapabilities* capabilities =
       image_capture_client_->capabilities();
   ASSERT_TRUE(capabilities);
-  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->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(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(100, capabilities->iso->min);
+  EXPECT_EQ(100, capabilities->iso->max);
+  EXPECT_EQ(100, capabilities->iso->current);
+  EXPECT_EQ(0, capabilities->iso->step);
+
   EXPECT_EQ(0, capabilities->brightness->min);
   EXPECT_EQ(0, capabilities->brightness->max);
   EXPECT_EQ(0, capabilities->brightness->current);
@@ -474,6 +459,26 @@ TEST_F(FakeVideoCaptureDeviceTest, GetAndSetCapabilities) {
   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(