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

third_party/WebKit/Source/modules/imagecapture/PhotoCapabilities.cpp

Index: third_party/WebKit/Source/modules/imagecapture/PhotoCapabilities.cpp
diff --git a/third_party/WebKit/Source/modules/imagecapture/PhotoCapabilities.cpp b/third_party/WebKit/Source/modules/imagecapture/PhotoCapabilities.cpp
index 4cecc72234cfec1fdd5eed054be1e559d0bbcf1f..83323bc0f05a88fbcc89997c5410c8de27429d3e 100644
--- a/third_party/WebKit/Source/modules/imagecapture/PhotoCapabilities.cpp
+++ b/third_party/WebKit/Source/modules/imagecapture/PhotoCapabilities.cpp
@@ -6,43 +6,11 @@
 
 namespace blink {
 
-namespace {
-
-String meteringModeToString(media::mojom::blink::MeteringMode mode) {
-  switch (mode) {
-    case media::mojom::blink::MeteringMode::NONE:
-      return "none";
-    case media::mojom::blink::MeteringMode::MANUAL:
-      return "manual";
-    case media::mojom::blink::MeteringMode::SINGLE_SHOT:
-      return "single-shot";
-    case media::mojom::blink::MeteringMode::CONTINUOUS:
-      return "continuous";
-    default:
-      NOTREACHED();
-  }
-  return emptyString;
-}
-
-}  // anonymous namespace
-
 // static
 PhotoCapabilities* PhotoCapabilities::create() {
   return new PhotoCapabilities();
 }
 
-String PhotoCapabilities::focusMode() const {
-  return meteringModeToString(m_focusMode);
-}
-
-String PhotoCapabilities::exposureMode() const {
-  return meteringModeToString(m_exposureMode);
-}
-
-String PhotoCapabilities::whiteBalanceMode() const {
-  return meteringModeToString(m_whiteBalanceMode);
-}
-
 String PhotoCapabilities::fillLightMode() const {
   switch (m_fillLightMode) {
     case media::mojom::blink::FillLightMode::NONE:
@@ -62,16 +30,8 @@ String PhotoCapabilities::fillLightMode() const {
 }
 
 DEFINE_TRACE(PhotoCapabilities) {
-  visitor->trace(m_iso);
   visitor->trace(m_imageHeight);
   visitor->trace(m_imageWidth);
-  visitor->trace(m_zoom);
-  visitor->trace(m_exposureCompensation);
-  visitor->trace(m_colorTemperature);
-  visitor->trace(m_brightness);
-  visitor->trace(m_contrast);
-  visitor->trace(m_saturation);
-  visitor->trace(m_sharpness);
 }
 
 }  // namespace blink