Delete ScanImageToString API

Remove the ScanImageToString API from lorgnette_manager_client since it
is no longer used.

Bug: b:158504381
Change-Id: I2f23562acce24dc890677a90445231355d552c43
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2346096
Commit-Queue: Fletcher Woodruff <fletcherw@chromium.org>
Reviewed-by: Jesse Schettler <jschettler@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#801207}

chromeos/dbus/fake_lorgnette_manager_client.cc

@@ -26,15 +26,6 @@ void FakeLorgnetteManagerClient::ListScanners(
       FROM_HERE, base::BindOnce(std::move(callback), list_scanners_response_));
 }
 
-void FakeLorgnetteManagerClient::ScanImageToString(
-    std::string device_name,
-    const ScanProperties& properties,
-    DBusMethodCallback<std::string> callback) {
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE,
-      base::BindOnce(std::move(callback), std::move(scan_image_response_)));
-}
-
 void FakeLorgnetteManagerClient::StartScan(
     std::string device_name,
     const ScanProperties& properties,

chromeos/dbus/fake_lorgnette_manager_client.h

@@ -26,9 +26,6 @@ class COMPONENT_EXPORT(CHROMEOS_DBUS) FakeLorgnetteManagerClient
 
   void ListScanners(
       DBusMethodCallback<lorgnette::ListScannersResponse> callback) override;
-  void ScanImageToString(std::string device_name,
-                         const ScanProperties& properties,
-                         DBusMethodCallback<std::string> callback) override;
 
   void StartScan(std::string device_name,
                  const ScanProperties& properties,

chromeos/dbus/lorgnette_manager_client.cc

@@ -31,15 +31,6 @@
 
 namespace chromeos {
 
-namespace {
-
-// It can take a scanner 2+ minutes to return one page at high resolution, so
-// extend the D-Bus timeout to 3 minutes.
-constexpr base::TimeDelta kScanImageDBusTimeout =
-    base::TimeDelta::FromMinutes(3);
-
-}  // namespace
-
 // The LorgnetteManagerClient implementation used in production.
 class LorgnetteManagerClientImpl : public LorgnetteManagerClient {
  public:
@@ -60,43 +51,6 @@ class LorgnetteManagerClientImpl : public LorgnetteManagerClient {
   }
 
   // LorgnetteManagerClient override.
-  void ScanImageToString(std::string device_name,
-                         const ScanProperties& properties,
-                         DBusMethodCallback<std::string> callback) override {
-    auto scan_data_reader = std::make_unique<ScanDataReader>();
-    base::ScopedFD fd = scan_data_reader->Start();
-
-    // Issue the dbus request to scan an image.
-    dbus::MethodCall method_call(lorgnette::kManagerServiceInterface,
-                                 lorgnette::kScanImageMethod);
-    dbus::MessageWriter writer(&method_call);
-    writer.AppendString(device_name);
-    writer.AppendFileDescriptor(fd.get());
-
-    dbus::MessageWriter option_writer(nullptr);
-    dbus::MessageWriter element_writer(nullptr);
-    writer.OpenArray("{sv}", &option_writer);
-    if (!properties.mode.empty()) {
-      option_writer.OpenDictEntry(&element_writer);
-      element_writer.AppendString(lorgnette::kScanPropertyMode);
-      element_writer.AppendVariantOfString(properties.mode);
-      option_writer.CloseContainer(&element_writer);
-    }
-    if (properties.resolution_dpi) {
-      option_writer.OpenDictEntry(&element_writer);
-      element_writer.AppendString(lorgnette::kScanPropertyResolution);
-      element_writer.AppendVariantOfUint32(properties.resolution_dpi);
-      option_writer.CloseContainer(&element_writer);
-    }
-    writer.CloseContainer(&option_writer);
-
-    lorgnette_daemon_proxy_->CallMethod(
-        &method_call, kScanImageDBusTimeout.InMilliseconds(),
-        base::BindOnce(&LorgnetteManagerClientImpl::OnScanImageComplete,
-                       weak_ptr_factory_.GetWeakPtr(), std::move(callback),
-                       std::move(scan_data_reader)));
-  }
-
   void StartScan(std::string device_name,
                  const ScanProperties& properties,
                  DBusMethodCallback<std::string> completion_callback,
@@ -255,24 +209,6 @@ class LorgnetteManagerClientImpl : public LorgnetteManagerClient {
     std::move(callback).Run(std::move(response_proto));
   }
 
-  // Called when a response for ScanImage() is received.
-  void OnScanImageComplete(DBusMethodCallback<std::string> callback,
-                           std::unique_ptr<ScanDataReader> scan_data_reader,
-                           dbus::Response* response) {
-    if (!response) {
-      LOG(ERROR) << "Failed to scan image";
-      // Do not touch |scan_data_reader|, so that RAII deletes it and
-      // cancels the inflight operation.
-      std::move(callback).Run(base::nullopt);
-      return;
-    }
-    auto* reader = scan_data_reader.get();
-    reader->Wait(
-        base::BindOnce(&LorgnetteManagerClientImpl::OnScanDataCompleted,
-                       weak_ptr_factory_.GetWeakPtr(), std::move(callback),
-                       std::move(scan_data_reader)));
-  }
-
   // Called when scan data read is completed.
   // This is to maintain the lifetime of ScanDataReader instance.
   void OnScanDataCompleted(DBusMethodCallback<std::string> callback,

chromeos/dbus/lorgnette_manager_client.h

@@ -36,13 +36,6 @@ class COMPONENT_EXPORT(CHROMEOS_DBUS) LorgnetteManagerClient
   virtual void ListScanners(
       DBusMethodCallback<lorgnette::ListScannersResponse> callback) = 0;
 
-  // Request a scanned image and calls |callback| when completed with a string
-  // pointing at the scanned image data.  Image data will be stored in the .png
-  // format.
-  virtual void ScanImageToString(std::string device_name,
-                                 const ScanProperties& properties,
-                                 DBusMethodCallback<std::string> callback) = 0;
-
   // Request a scanned image using lorgnette's StartScan API and calls
   // |completion_callback| when completed with a string pointing at the scanned
   // image data. Image data will be stored in the .png format.