Switch CloudPrintProxyService::PrintersCallback to OnceCallback.

Change-Id: I1c3ad2db29d6f5446a045990036f467054d735d8
Reviewed-on: https://chromium-review.googlesource.com/1179307
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#584674}

chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.cc

@@ -6,6 +6,7 @@
 
 #include <memory>
 #include <string>
+#include <utility>
 
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
@@ -110,7 +111,7 @@ ExtensionFunction::ResponseAction CloudPrintPrivateGetPrintersFunction::Run() {
     return RespondNow(Error(kErrorIncognito));
 
   service->GetPrinters(
-      base::Bind(&CloudPrintPrivateGetPrintersFunction::SendResults, this));
+      base::BindOnce(&CloudPrintPrivateGetPrintersFunction::SendResults, this));
   return RespondLater();
 }
 

chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc

@@ -34,14 +34,13 @@ using content::BrowserThread;
 
 namespace {
 
-void ForwardGetPrintersResult(
-    const CloudPrintProxyService::PrintersCallback& callback,
-    const std::vector<std::string>& printers) {
+void ForwardGetPrintersResult(CloudPrintProxyService::PrintersCallback callback,
+                              const std::vector<std::string>& printers) {
   UMA_HISTOGRAM_ENUMERATION("CloudPrint.ServiceEvents",
                             ServiceProcessControl::SERVICE_PRINTERS_REPLY,
                             ServiceProcessControl::SERVICE_EVENT_MAX);
   UMA_HISTOGRAM_COUNTS_10000("CloudPrint.AvailablePrinters", printers.size());
-  callback.Run(printers);
+  std::move(callback).Run(printers);
 }
 
 std::string ReadCloudPrintSetupProxyList(const base::FilePath& path) {
@@ -140,11 +139,12 @@ bool CloudPrintProxyService::ApplyCloudPrintConnectorPolicy() {
   return true;
 }
 
-void CloudPrintProxyService::GetPrinters(const PrintersCallback& callback) {
+void CloudPrintProxyService::GetPrinters(PrintersCallback callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (!profile_->GetPrefs()->GetBoolean(prefs::kCloudPrintProxyEnabled)) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::BindOnce(callback, std::vector<std::string>()));
+        FROM_HERE,
+        base::BindOnce(std::move(callback), std::vector<std::string>()));
     return;
   }
 
@@ -154,7 +154,7 @@ void CloudPrintProxyService::GetPrinters(const PrintersCallback& callback) {
   if (list_path.empty()) {
     InvokeServiceTask(
         base::BindOnce(&CloudPrintProxyService::GetCloudPrintProxyPrinters,
-                       weak_factory_.GetWeakPtr(), callback));
+                       weak_factory_.GetWeakPtr(), std::move(callback)));
     return;
   }
 
@@ -162,11 +162,11 @@ void CloudPrintProxyService::GetPrinters(const PrintersCallback& callback) {
       extensions::GetExtensionFileTaskRunner().get(), FROM_HERE,
       base::BindOnce(&ReadCloudPrintSetupProxyList, list_path),
       base::BindOnce(&CloudPrintProxyService::OnReadCloudPrintSetupProxyList,
-                     weak_factory_.GetWeakPtr(), callback));
+                     weak_factory_.GetWeakPtr(), std::move(callback)));
 }
 
 void CloudPrintProxyService::GetCloudPrintProxyPrinters(
-    const PrintersCallback& callback) {
+    PrintersCallback callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   UMA_HISTOGRAM_ENUMERATION("CloudPrint.ServiceEvents",
                             ServiceProcessControl::SERVICE_PRINTERS_REQUEST,
@@ -174,7 +174,7 @@ void CloudPrintProxyService::GetCloudPrintProxyPrinters(
   ServiceProcessControl* process_control = GetServiceProcessControl();
   DCHECK(process_control->IsConnected());
   GetCloudPrintProxy().GetPrinters(
-      base::BindOnce(&ForwardGetPrintersResult, callback));
+      base::BindOnce(&ForwardGetPrintersResult, std::move(callback)));
 }
 
 void CloudPrintProxyService::RefreshCloudPrintProxyStatus() {
@@ -241,7 +241,7 @@ cloud_print::mojom::CloudPrint& CloudPrintProxyService::GetCloudPrintProxy() {
 }
 
 void CloudPrintProxyService::OnReadCloudPrintSetupProxyList(
-    const PrintersCallback& callback,
+    PrintersCallback callback,
     const std::string& printers_json) {
   std::unique_ptr<base::Value> list_value =
       base::ListValue::From(base::JSONReader::Read(printers_json));
@@ -255,5 +255,5 @@ void CloudPrintProxyService::OnReadCloudPrintSetupProxyList(
   UMA_HISTOGRAM_COUNTS_10000("CloudPrint.AvailablePrintersList",
                              printers.size());
   base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE, base::BindOnce(callback, printers));
+      FROM_HERE, base::BindOnce(std::move(callback), printers));
 }

chrome/browser/printing/cloud_print/cloud_print_proxy_service.h

@@ -33,15 +33,15 @@ class CloudPrintProxyService : public KeyedService {
   explicit CloudPrintProxyService(Profile* profile);
   ~CloudPrintProxyService() override;
 
-  typedef base::Callback<void(const std::vector<std::string>&)>
-      PrintersCallback;
+  using PrintersCallback =
+      base::OnceCallback<void(const std::vector<std::string>&)>;
 
   // Initializes the object. This should be called every time an object of this
   // class is constructed.
   void Initialize();
 
   // Returns list of printer names available for registration.
-  void GetPrinters(const PrintersCallback& callback);
+  void GetPrinters(PrintersCallback callback);
 
   // Enables/disables cloud printing for the user
   virtual void EnableForUserWithRobot(const std::string& robot_auth_code,
@@ -54,7 +54,7 @@ class CloudPrintProxyService : public KeyedService {
   // update the browser prefs.
   void RefreshStatusFromService();
 
-  std::string proxy_id() const { return proxy_id_; }
+  const std::string& proxy_id() const { return proxy_id_; }
 
  private:
   // NotificationDelegate implementation for the token expired notification.
@@ -62,7 +62,7 @@ class CloudPrintProxyService : public KeyedService {
   friend class TokenExpiredNotificationDelegate;
 
   // Methods that send an IPC to the service.
-  void GetCloudPrintProxyPrinters(const PrintersCallback& callback);
+  void GetCloudPrintProxyPrinters(PrintersCallback callback);
   void RefreshCloudPrintProxyStatus();
   void EnableCloudPrintProxyWithRobot(const std::string& robot_auth_code,
                                       const std::string& robot_email,
@@ -89,7 +89,7 @@ class CloudPrintProxyService : public KeyedService {
   // Virtual for testing.
   virtual ServiceProcessControl* GetServiceProcessControl();
 
-  void OnReadCloudPrintSetupProxyList(const PrintersCallback& callback,
+  void OnReadCloudPrintSetupProxyList(PrintersCallback callback,
                                       const std::string& printers_json);
 
   Profile* const profile_;