scanning: Remove Optional wrapper from callback

The progress_callback is already nullable, so it doesn't need to be
wrapped with base::Optional.

Bug: None
Change-Id: Ifb43c88ab59b2ec0208225359b11070407fc5912
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2442571Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Commit-Queue: Jesse Schettler <jschettler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813450}

chrome/browser/chromeos/scanning/lorgnette_scanner_manager.cc

@@ -11,6 +11,7 @@
 #include <vector>
 
 #include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/check.h"
 #include "base/containers/flat_map.h"
 #include "base/logging.h"
@@ -98,9 +99,9 @@ class LorgnetteScannerManagerImpl final : public LorgnetteScannerManager {
       return;
     }
 
-    GetLorgnetteManagerClient()->StartScan(device_name, settings,
-                                           std::move(callback), page_callback,
-                                           base::nullopt);
+    GetLorgnetteManagerClient()->StartScan(
+        device_name, settings, std::move(callback), std::move(page_callback),
+        base::NullCallback());
   }
 
  private:

chromeos/dbus/fake_lorgnette_manager_client.cc

@@ -38,14 +38,14 @@ void FakeLorgnetteManagerClient::StartScan(
     const lorgnette::ScanSettings& settings,
     VoidDBusMethodCallback completion_callback,
     base::RepeatingCallback<void(std::string)> page_callback,
-    base::Optional<base::RepeatingCallback<void(int)>> progress_callback) {
+    base::RepeatingCallback<void(int)> progress_callback) {
   if (scan_response_.has_value()) {
     for (const std::string& page_data : scan_response_.value()) {
       // Simulate progress reporting for the scan job.
-      if (progress_callback.has_value()) {
+      if (progress_callback) {
         for (int progress : {7, 22, 40, 42, 59, 74, 95}) {
           base::ThreadTaskRunnerHandle::Get()->PostTask(
-              FROM_HERE, base::BindOnce(progress_callback.value(), progress));
+              FROM_HERE, base::BindOnce(progress_callback, progress));
         }
       }
 

chromeos/dbus/fake_lorgnette_manager_client.h

@@ -34,8 +34,7 @@ class COMPONENT_EXPORT(CHROMEOS_DBUS) FakeLorgnetteManagerClient
                  const lorgnette::ScanSettings& settings,
                  VoidDBusMethodCallback completion_callback,
                  base::RepeatingCallback<void(std::string)> page_callback,
-                 base::Optional<base::RepeatingCallback<void(int)>>
-                     progress_callback) override;
+                 base::RepeatingCallback<void(int)> progress_callback) override;
 
   // Sets the response returned by ListScanners().
   void SetListScannersResponse(

chromeos/dbus/lorgnette_manager_client.cc

@@ -66,12 +66,12 @@ class LorgnetteManagerClientImpl : public LorgnetteManagerClient {
   }
 
   // LorgnetteManagerClient override.
-  void StartScan(const std::string& device_name,
-                 const lorgnette::ScanSettings& settings,
-                 VoidDBusMethodCallback completion_callback,
-                 base::RepeatingCallback<void(std::string)> page_callback,
-                 base::Optional<base::RepeatingCallback<void(int)>>
-                     progress_callback) override {
+  void StartScan(
+      const std::string& device_name,
+      const lorgnette::ScanSettings& settings,
+      VoidDBusMethodCallback completion_callback,
+      base::RepeatingCallback<void(std::string)> page_callback,
+      base::RepeatingCallback<void(int)> progress_callback) override {
     lorgnette::StartScanRequest request;
     request.set_device_name(device_name);
     *request.mutable_settings() = settings;
@@ -88,8 +88,8 @@ class LorgnetteManagerClientImpl : public LorgnetteManagerClient {
 
     ScanJobState state;
     state.completion_callback = std::move(completion_callback);
-    state.progress_callback = progress_callback;
-    state.page_callback = page_callback;
+    state.progress_callback = std::move(progress_callback);
+    state.page_callback = std::move(page_callback);
 
     lorgnette_daemon_proxy_->CallMethod(
         &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
@@ -184,7 +184,7 @@ class LorgnetteManagerClientImpl : public LorgnetteManagerClient {
   // of data into a string.
   struct ScanJobState {
     VoidDBusMethodCallback completion_callback;
-    base::Optional<base::RepeatingCallback<void(int)>> progress_callback;
+    base::RepeatingCallback<void(int)> progress_callback;
     base::RepeatingCallback<void(std::string)> page_callback;
     std::unique_ptr<ScanDataReader> scan_data_reader;
   };
@@ -383,8 +383,8 @@ class LorgnetteManagerClientImpl : public LorgnetteManagerClient {
       VLOG(1) << "Scan job " << signal_proto.scan_uuid()
               << " completed successfully";
     } else if (signal_proto.state() == lorgnette::SCAN_STATE_IN_PROGRESS &&
-               state.progress_callback.has_value()) {
-      state.progress_callback.value().Run(signal_proto.progress());
+               !state.progress_callback.is_null()) {
+      state.progress_callback.Run(signal_proto.progress());
     }
   }
 

chromeos/dbus/lorgnette_manager_client.h

@@ -54,7 +54,7 @@ class COMPONENT_EXPORT(CHROMEOS_DBUS) LorgnetteManagerClient
       const lorgnette::ScanSettings& settings,
       VoidDBusMethodCallback completion_callback,
       base::RepeatingCallback<void(std::string)> page_callback,
-      base::Optional<base::RepeatingCallback<void(int)>> progress_callback) = 0;
+      base::RepeatingCallback<void(int)> progress_callback) = 0;
 
   // Factory function, creates a new instance and returns ownership.
   // For normal usage, access the singleton via DBusThreadManager::Get().