Speech recognition: Use BindOnce / OnceCallback / OnceClosure where applicable

Within browser/speech code, use BindOnce when posting tasks to
check whether speech recognition is allowed.

Bug: 714018
Change-Id: Ifa4eb2797601be2736dda1bf1a17ac57e5a34301
Reviewed-on: https://chromium-review.googlesource.com/565762
Commit-Queue: Mark Pilgrim <pilgrim@chromium.org>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Reviewed-by: Tommi <tommi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485944}

chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc

@@ -271,7 +271,7 @@ void ChromeSpeechRecognitionManagerDelegate::OnRecognitionEnd(int session_id) {
 
 void ChromeSpeechRecognitionManagerDelegate::CheckRecognitionIsAllowed(
     int session_id,
-    base::Callback<void(bool ask_user, bool is_allowed)> callback) {
+    base::OnceCallback<void(bool ask_user, bool is_allowed)> callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   const content::SpeechRecognitionSessionContext& context =
@@ -292,11 +292,10 @@ void ChromeSpeechRecognitionManagerDelegate::CheckRecognitionIsAllowed(
 
   // Check that the render view type is appropriate, and whether or not we
   // need to request permission from the user.
-  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-                          base::Bind(&CheckRenderViewType,
-                                     callback,
-                                     render_process_id,
-                                     render_view_id));
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
+      base::BindOnce(&CheckRenderViewType, std::move(callback),
+                     render_process_id, render_view_id));
 }
 
 content::SpeechRecognitionEventListener*
@@ -317,7 +316,7 @@ bool ChromeSpeechRecognitionManagerDelegate::FilterProfanities(
 
 // static.
 void ChromeSpeechRecognitionManagerDelegate::CheckRenderViewType(
-    base::Callback<void(bool ask_user, bool is_allowed)> callback,
+    base::OnceCallback<void(bool ask_user, bool is_allowed)> callback,
     int render_process_id,
     int render_view_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -331,8 +330,9 @@ void ChromeSpeechRecognitionManagerDelegate::CheckRenderViewType(
     // This happens for extensions. Manifest should be checked for permission.
     allowed = true;
     check_permission = false;
-    BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
-                            base::Bind(callback, check_permission, allowed));
+    BrowserThread::PostTask(
+        BrowserThread::IO, FROM_HERE,
+        base::BindOnce(std::move(callback), check_permission, allowed));
     return;
   }
 
@@ -357,8 +357,9 @@ void ChromeSpeechRecognitionManagerDelegate::CheckRenderViewType(
   check_permission = true;
 #endif
 
-  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
-                          base::Bind(callback, check_permission, allowed));
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      base::BindOnce(std::move(callback), check_permission, allowed));
 }
 
 }  // namespace speech

chrome/browser/speech/chrome_speech_recognition_manager_delegate.h

@@ -45,7 +45,8 @@ class ChromeSpeechRecognitionManagerDelegate
   // SpeechRecognitionManagerDelegate methods.
   void CheckRecognitionIsAllowed(
       int session_id,
-      base::Callback<void(bool ask_user, bool is_allowed)> callback) override;
+      base::OnceCallback<void(bool ask_user, bool is_allowed)> callback)
+      override;
   content::SpeechRecognitionEventListener* GetEventListener() override;
   bool FilterProfanities(int render_process_id) override;
 
@@ -58,7 +59,7 @@ class ChromeSpeechRecognitionManagerDelegate
   // Checks for VIEW_TYPE_TAB_CONTENTS host in the UI thread and notifies back
   // the result in the IO thread through |callback|.
   static void CheckRenderViewType(
-      base::Callback<void(bool ask_user, bool is_allowed)> callback,
+      base::OnceCallback<void(bool ask_user, bool is_allowed)> callback,
       int render_process_id,
       int render_view_id);
 

content/browser/speech/speech_recognition_manager_impl.cc

@@ -156,9 +156,9 @@ void SpeechRecognitionManagerImpl::StartSession(int session_id) {
   if (delegate_) {
     delegate_->CheckRecognitionIsAllowed(
         session_id,
-        base::Bind(&SpeechRecognitionManagerImpl::RecognitionAllowedCallback,
-                   weak_factory_.GetWeakPtr(),
-                   session_id));
+        base::BindOnce(
+            &SpeechRecognitionManagerImpl::RecognitionAllowedCallback,
+            weak_factory_.GetWeakPtr(), session_id));
   }
 }
 
@@ -274,7 +274,7 @@ void SpeechRecognitionManagerImpl::OnRecognitionStart(int session_id) {
   SessionsTable::iterator iter = sessions_.find(session_id);
   if (iter->second->ui) {
     // Notify the UI that the devices are being used.
-    iter->second->ui->OnStarted(base::Closure(),
+    iter->second->ui->OnStarted(base::OnceClosure(),
                                 MediaStreamUIProxy::WindowIdCallback());
   }
 

content/public/browser/speech_recognition_manager_delegate.h

@@ -24,7 +24,7 @@ class SpeechRecognitionManagerDelegate {
   // This is called on the IO thread.
   virtual void CheckRecognitionIsAllowed(
       int session_id,
-      base::Callback<void(bool ask_user, bool is_allowed)> callback) = 0;
+      base::OnceCallback<void(bool ask_user, bool is_allowed)> callback) = 0;
 
   // Checks whether the delegate is interested (returning a non nullptr ptr) or
   // not (returning nullptr) in receiving a copy of all sessions events.

content/shell/browser/shell_speech_recognition_manager_delegate.cc

@@ -6,18 +6,19 @@
 
 #include "content/public/browser/browser_thread.h"
 
-using base::Callback;
+using base::OnceCallback;
 
 namespace content {
 
 void ShellSpeechRecognitionManagerDelegate::CheckRecognitionIsAllowed(
-    int session_id, Callback<void(bool ask_user, bool is_allowed)> callback) {
+    int session_id,
+    OnceCallback<void(bool ask_user, bool is_allowed)> callback) {
   // In content_shell, we expect speech recognition to happen when requested.
   // Therefore we simply authorize it by calling back with is_allowed=true. The
   // first parameter, ask_user, is set to false because we don't want to prompt
   // the user for permission with an infobar.
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE, base::Bind(callback, false, true));
+  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
+                          base::BindOnce(std::move(callback), false, true));
 }
 
 SpeechRecognitionEventListener*

content/shell/browser/shell_speech_recognition_manager_delegate.h

@@ -25,7 +25,8 @@ class ShellSpeechRecognitionManagerDelegate
   // SpeechRecognitionManagerDelegate methods.
   void CheckRecognitionIsAllowed(
       int session_id,
-      base::Callback<void(bool ask_user, bool is_allowed)> callback) override;
+      base::OnceCallback<void(bool ask_user, bool is_allowed)> callback)
+      override;
   SpeechRecognitionEventListener* GetEventListener() override;
   bool FilterProfanities(int render_process_id) override;
 

extensions/shell/browser/shell_speech_recognition_manager_delegate.cc

@@ -66,7 +66,7 @@ void ShellSpeechRecognitionManagerDelegate::OnAudioLevelsChange(
 
 void ShellSpeechRecognitionManagerDelegate::CheckRecognitionIsAllowed(
     int session_id,
-    base::Callback<void(bool ask_user, bool is_allowed)> callback) {
+    base::OnceCallback<void(bool ask_user, bool is_allowed)> callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   const content::SpeechRecognitionSessionContext& context =
@@ -76,11 +76,10 @@ void ShellSpeechRecognitionManagerDelegate::CheckRecognitionIsAllowed(
   // |render_process_id| field, which is needed later to retrieve the profile.
   DCHECK_NE(context.render_process_id, 0);
 
-  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-                          base::Bind(&CheckRenderViewType,
-                                     callback,
-                                     context.render_process_id,
-                                     context.render_view_id));
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
+      base::BindOnce(&CheckRenderViewType, std::move(callback),
+                     context.render_process_id, context.render_view_id));
 }
 
 content::SpeechRecognitionEventListener*
@@ -96,7 +95,7 @@ bool ShellSpeechRecognitionManagerDelegate::FilterProfanities(
 
 // static
 void ShellSpeechRecognitionManagerDelegate::CheckRenderViewType(
-    base::Callback<void(bool ask_user, bool is_allowed)> callback,
+    base::OnceCallback<void(bool ask_user, bool is_allowed)> callback,
     int render_process_id,
     int render_view_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -119,8 +118,9 @@ void ShellSpeechRecognitionManagerDelegate::CheckRenderViewType(
     }
   }
 
-  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
-                          base::Bind(callback, check_permission, allowed));
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      base::BindOnce(std::move(callback), check_permission, allowed));
 }
 
 }  // namespace speech

extensions/shell/browser/shell_speech_recognition_manager_delegate.h

@@ -41,12 +41,13 @@ class ShellSpeechRecognitionManagerDelegate
   // SpeechRecognitionManagerDelegate methods.
   void CheckRecognitionIsAllowed(
       int session_id,
-      base::Callback<void(bool ask_user, bool is_allowed)> callback) override;
+      base::OnceCallback<void(bool ask_user, bool is_allowed)> callback)
+      override;
   content::SpeechRecognitionEventListener* GetEventListener() override;
   bool FilterProfanities(int render_process_id) override;
 
   static void CheckRenderViewType(
-      base::Callback<void(bool ask_user, bool is_allowed)> callback,
+      base::OnceCallback<void(bool ask_user, bool is_allowed)> callback,
       int render_process_id,
       int render_view_id);