Image Capture: prune Photo{Capabilities/Settings} and add MediaTrackConstraintSet.pointsOfInterest

third_party/WebKit/LayoutTests/imagecapture/resources/mock-imagecapture.js

Index: third_party/WebKit/LayoutTests/imagecapture/resources/mock-imagecapture.js
diff --git a/third_party/WebKit/LayoutTests/imagecapture/resources/mock-imagecapture.js b/third_party/WebKit/LayoutTests/imagecapture/resources/mock-imagecapture.js
index 2293031cacc3942f072ffe1d11f0d396c77e5501..4f0ac3159ac16898dcc0f3e0d6b5b3b52b4173f7 100644
--- a/third_party/WebKit/LayoutTests/imagecapture/resources/mock-imagecapture.js
+++ b/third_party/WebKit/LayoutTests/imagecapture/resources/mock-imagecapture.js
@@ -13,7 +13,7 @@ let mockImageCaptureReady = define(
           imageCapture.ImageCapture.name,
           handle => this.bindingSet_.addBinding(this, handle));
 
-      this.capabilities_ = { capabilities : {
+      this.state_ = { capabilities : {
           iso : { min : 100.0, max : 12000.0, current : 400.0, step : 1.0 },
           height : { min : 240.0, max : 2448.0, current : 240.0, step : 2.0 },
           width : { min : 320.0, max : 3264.0, current : 320.0, step : 3.0 },
@@ -31,63 +31,61 @@ let mockImageCaptureReady = define(
           contrast : { min : 2.0, max : 9.0, current : 5.0, step : 1.0 },
           saturation : { min : 3.0, max : 8.0, current : 6.0, step : 1.0 },
           sharpness : { min : 4.0, max : 7.0, current : 7.0, step : 1.0 },
+          points_of_interest : [],
       }};
       this.settings_ = null;
       this.bindingSet_ = new bindings.BindingSet(imageCapture.ImageCapture);
     }
 
     getCapabilities(source_id) {
-      return Promise.resolve(this.capabilities_);
+      return Promise.resolve(this.state_);
     }
 
     setOptions(source_id, settings) {
       this.settings_ = settings;
       if (settings.has_iso)
-        this.capabilities_.capabilities.iso.current = settings.iso;
+        this.state_.capabilities.iso.current = settings.iso;
       if (settings.has_height)
-        this.capabilities_.capabilities.height.current = settings.height;
+        this.state_.capabilities.height.current = settings.height;
       if (settings.has_width)
-        this.capabilities_.capabilities.width.current = settings.width;
+        this.state_.capabilities.width.current = settings.width;
       if (settings.has_zoom)
-        this.capabilities_.capabilities.zoom.current = settings.zoom;
-      if (settings.has_focus_mode) {
-        this.capabilities_.capabilities.focus_mode =
-            settings.focus_mode;
-      }
-      if (settings.has_exposure_mode) {
-        this.capabilities_.capabilities.exposure_mode =
-            settings.exposure_mode;
+        this.state_.capabilities.zoom.current = settings.zoom;
+      if (settings.has_focus_mode)
+        this.state_.capabilities.focus_mode = settings.focus_mode;
+
+      if (settings.points_of_interest.length > 0) {
+        this.state_.capabilities.points_of_interest =
+            settings.points_of_interest;
       }
+
+      if (settings.has_exposure_mode)
+        this.state_.capabilities.exposure_mode = settings.exposure_mode;
+
       if (settings.has_exposure_compensation) {
-        this.capabilities_.capabilities.exposure_compensation.current =
+        this.state_.capabilities.exposure_compensation.current =
             settings.exposure_compensation;
       }
       if (settings.has_white_balance_mode) {
-        this.capabilities_.capabilities.white_balance_mode =
+        this.state_.capabilities.white_balance_mode =
             settings.white_balance_mode;
       }
-      if (settings.has_fill_light_mode) {
-        this.capabilities_.capabilities.fill_light_mode =
-            settings.fill_light_mode;
-      }
-      if (settings.has_red_eye_reduction) {
-        this.capabilities_.capabilities.red_eye_reduction =
-            settings.red_eye_reduction;
-      }
+      if (settings.has_fill_light_mode)
+        this.state_.capabilities.fill_light_mode = settings.fill_light_mode;
+      if (settings.has_red_eye_reduction)
+        this.state_.capabilities.red_eye_reduction = settings.red_eye_reduction;
       if (settings.has_color_temperature) {
-        this.capabilities_.capabilities.color_temperature.current =
+        this.state_.capabilities.color_temperature.current =
             settings.color_temperature;
       }
       if (settings.has_brightness)
-        this.capabilities_.capabilities.brightness.current = settings.brightness;
+        this.state_.capabilities.brightness.current = settings.brightness;
       if (settings.has_contrast)
-        this.capabilities_.capabilities.contrast.current = settings.contrast;
-      if (settings.has_saturation) {
-        this.capabilities_.capabilities.saturation.current =
-            settings.saturation;
-      }
+        this.state_.capabilities.contrast.current = settings.contrast;
+      if (settings.has_saturation)
+        this.state_.capabilities.saturation.current = settings.saturation;
       if (settings.has_sharpness)
-        this.capabilities_.capabilities.sharpness.current = settings.sharpness;
+        this.state_.capabilities.sharpness.current = settings.sharpness;
 
       return Promise.resolve({ success : true });
     }
@@ -98,7 +96,7 @@ let mockImageCaptureReady = define(
     }
 
     capabilities() {
-      return this.capabilities_.capabilities;
+      return this.state_.capabilities;
     }
 
     options() {