Revert of Image Capture: teach takePhoto() to accept an optional PhotoSettings dictionary

third_party/WebKit/Source/modules/imagecapture/ImageCapture.h

Index: third_party/WebKit/Source/modules/imagecapture/ImageCapture.h
diff --git a/third_party/WebKit/Source/modules/imagecapture/ImageCapture.h b/third_party/WebKit/Source/modules/imagecapture/ImageCapture.h
index 31f1d79a2cf537065002e87222dbeee703538b5e..e1138bdc8fd23a87af15ed6df899d70999938b93 100644
--- a/third_party/WebKit/Source/modules/imagecapture/ImageCapture.h
+++ b/third_party/WebKit/Source/modules/imagecapture/ImageCapture.h
@@ -56,12 +56,9 @@
 
   ScriptPromise getPhotoCapabilities(ScriptState*);
 
-  ScriptPromise setOptions(ScriptState*,
-                           const PhotoSettings&,
-                           bool trigger_take_photo = false);
+  ScriptPromise setOptions(ScriptState*, const PhotoSettings&);
 
   ScriptPromise takePhoto(ScriptState*);
-  ScriptPromise takePhoto(ScriptState*, const PhotoSettings&);
 
   ScriptPromise grabFrame(ScriptState*);
 
@@ -80,15 +77,14 @@
  private:
   ImageCapture(ExecutionContext*, MediaStreamTrack*);
 
-  void OnMojoPhotoCapabilities(ScriptPromiseResolver*,
-                               bool trigger_take_photo,
-                               media::mojom::blink::PhotoCapabilitiesPtr);
-  void OnMojoSetOptions(ScriptPromiseResolver*,
-                        bool trigger_take_photo,
-                        bool result);
-  void OnMojoTakePhoto(ScriptPromiseResolver*, media::mojom::blink::BlobPtr);
+  void OnPhotoCapabilities(ScriptPromiseResolver*,
+                           media::mojom::blink::PhotoCapabilitiesPtr);
+  void OnSetOptions(ScriptPromiseResolver*, bool);
+  void OnTakePhoto(ScriptPromiseResolver*, media::mojom::blink::BlobPtr);
+  void OnCapabilitiesUpdate(media::mojom::blink::PhotoCapabilitiesPtr);
 
-  void UpdateMediaTrackCapabilities(media::mojom::blink::PhotoCapabilitiesPtr);
+  void OnCapabilitiesUpdateInternal(
+      const media::mojom::blink::PhotoCapabilities&);
   void OnServiceConnectionError();
 
   Member<MediaStreamTrack> stream_track_;