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

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

 // Copyright 2016 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.
 
 #ifndef ImageCapture_h
 #define ImageCapture_h
 
 #include <memory>
 #include "bindings/core/v8/ActiveScriptWrappable.h"
 #include "bindings/core/v8/ScriptPromise.h"
@@ skipping 38 matching lines @@
   // ScriptWrappable implementation.
   bool HasPendingActivity() const final;
 
   // ContextLifecycleObserver
   void ContextDestroyed(ExecutionContext*) override;
 
   MediaStreamTrack* videoStreamTrack() const { return stream_track_.Get(); }
 
   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*);
 
   MediaTrackCapabilities& GetMediaTrackCapabilities();
   void SetMediaTrackConstraints(ScriptPromiseResolver*,
                                 const HeapVector<MediaTrackConstraintSet>&);
   const MediaTrackConstraintSet& GetMediaTrackConstraints() const;
   void ClearMediaTrackConstraints(ScriptPromiseResolver*);
   void GetMediaTrackSettings(MediaTrackSettings&) const;
 
   // TODO(mcasas): Remove this service method, https://crbug.com/338503.
   bool HasNonImageCaptureConstraints(const MediaTrackConstraints&) const;
 
   DECLARE_VIRTUAL_TRACE();
 
  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_;
   std::unique_ptr<WebImageCaptureFrameGrabber> frame_grabber_;
   media::mojom::blink::ImageCapturePtr service_;
 
   MediaTrackCapabilities capabilities_;
   MediaTrackSettings settings_;
   MediaTrackConstraintSet current_constraints_;
 
   HeapHashSet<Member<ScriptPromiseResolver>> service_requests_;
 };
 
 }  // namespace blink
 
 #endif  // ImageCapture_h