Migrate LoginAuthRequiredCallback to BindOnce

Bug: 714018
Change-Id: Icf71c24297709c96513db23e7f562dce298e6374
Reviewed-on: https://chromium-review.googlesource.com/1048070Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Mark Pilgrim <pilgrim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#556617}

android_webview/browser/aw_content_browser_client.cc

@@ -696,11 +696,10 @@ AwContentBrowserClient::CreateLoginDelegate(
     bool is_main_frame,
     const GURL& url,
     bool first_auth_attempt,
-    const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-        auth_required_callback) {
-  return base::MakeRefCounted<AwLoginDelegate>(auth_info, web_contents_getter,
-                                               first_auth_attempt,
-                                               auth_required_callback);
+    LoginAuthRequiredCallback auth_required_callback) {
+  return base::MakeRefCounted<AwLoginDelegate>(
+      auth_info, web_contents_getter, first_auth_attempt,
+      std::move(auth_required_callback));
 }
 
 bool AwContentBrowserClient::HandleExternalProtocol(

android_webview/browser/aw_content_browser_client.h

@@ -175,8 +175,7 @@ class AwContentBrowserClient : public content::ContentBrowserClient {
       bool is_main_frame,
       const GURL& url,
       bool first_auth_attempt,
-      const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-          auth_required_callback) override;
+      LoginAuthRequiredCallback auth_required_callback) override;
   bool HandleExternalProtocol(
       const GURL& url,
       content::ResourceRequestInfo::WebContentsGetter web_contents_getter,

android_webview/browser/aw_login_delegate.cc

@@ -24,9 +24,9 @@ AwLoginDelegate::AwLoginDelegate(
     net::AuthChallengeInfo* auth_info,
     content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
     bool first_auth_attempt,
-    const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-        auth_required_callback)
-    : auth_info_(auth_info), auth_required_callback_(auth_required_callback) {
+    LoginAuthRequiredCallback auth_required_callback)
+    : auth_info_(auth_info),
+      auth_required_callback_(std::move(auth_required_callback)) {
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::BindOnce(&AwLoginDelegate::HandleHttpAuthRequestOnUIThread, this,

android_webview/browser/aw_login_delegate.h

@@ -12,12 +12,12 @@
 #include "base/memory/ref_counted.h"
 #include "base/optional.h"
 #include "base/strings/string16.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/login_delegate.h"
 #include "content/public/browser/resource_request_info.h"
 
 namespace net {
 class AuthChallengeInfo;
-class AuthCredentials;
 }
 
 namespace android_webview {
@@ -28,8 +28,7 @@ class AwLoginDelegate : public content::LoginDelegate {
       net::AuthChallengeInfo* auth_info,
       content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
       bool first_auth_attempt,
-      const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-          auth_required_callback);
+      LoginAuthRequiredCallback auth_required_callback);
 
   virtual void Proceed(const base::string16& user,
                        const base::string16& password);
@@ -51,8 +50,7 @@ class AwLoginDelegate : public content::LoginDelegate {
 
   std::unique_ptr<AwHttpAuthHandler> aw_http_auth_handler_;
   scoped_refptr<net::AuthChallengeInfo> auth_info_;
-  base::Callback<void(const base::Optional<net::AuthCredentials>&)>
-      auth_required_callback_;
+  LoginAuthRequiredCallback auth_required_callback_;
 };
 
 }  // namespace android_webview

chrome/browser/chrome_content_browser_client.cc

@@ -4179,10 +4179,9 @@ ChromeContentBrowserClient::CreateLoginDelegate(
     bool is_main_frame,
     const GURL& url,
     bool first_auth_attempt,
-    const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-        auth_required_callback) {
+    LoginAuthRequiredCallback auth_required_callback) {
   return CreateLoginPrompt(auth_info, web_contents_getter, is_main_frame, url,
-                           auth_required_callback);
+                           std::move(auth_required_callback));
 }
 
 bool ChromeContentBrowserClient::HandleExternalProtocol(

chrome/browser/chrome_content_browser_client.h

@@ -426,8 +426,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
       bool is_main_frame,
       const GURL& url,
       bool first_auth_attempt,
-      const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-          auth_required_callback) override;
+      LoginAuthRequiredCallback auth_required_callback) override;
   bool HandleExternalProtocol(
       const GURL& url,
       content::ResourceRequestInfo::WebContentsGetter web_contents_getter,

chrome/browser/ui/android/login_handler_android.cc

@@ -27,9 +27,10 @@ class LoginHandlerAndroid : public LoginHandler {
   LoginHandlerAndroid(
       net::AuthChallengeInfo* auth_info,
       content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-      const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-          auth_required_callback)
-      : LoginHandler(auth_info, web_contents_getter, auth_required_callback) {}
+      LoginAuthRequiredCallback auth_required_callback)
+      : LoginHandler(auth_info,
+                     web_contents_getter,
+                     std::move(auth_required_callback)) {}
 
   // LoginHandler methods:
 
@@ -96,8 +97,7 @@ class LoginHandlerAndroid : public LoginHandler {
 scoped_refptr<LoginHandler> LoginHandler::Create(
     net::AuthChallengeInfo* auth_info,
     content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-    const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-        auth_required_callback) {
+    LoginAuthRequiredCallback auth_required_callback) {
   return base::MakeRefCounted<LoginHandlerAndroid>(
-      auth_info, web_contents_getter, auth_required_callback);
+      auth_info, web_contents_getter, std::move(auth_required_callback));
 }

chrome/browser/ui/browser_dialogs.h

@@ -15,6 +15,7 @@
 #include "base/strings/string16.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/bookmarks/bookmark_editor.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/resource_request_info.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/native_widget_types.h"
@@ -47,7 +48,6 @@ class Extension;
 
 namespace net {
 class AuthChallengeInfo;
-class AuthCredentials;
 }
 
 namespace payments {
@@ -162,8 +162,7 @@ void ShowUpdateChromeDialogViews(gfx::NativeWindow parent);
 scoped_refptr<LoginHandler> CreateLoginHandlerViews(
     net::AuthChallengeInfo* auth_info,
     content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-    const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-        auth_required_callback);
+    LoginAuthRequiredCallback auth_required_callback);
 
 // Shows the toolkit-views based BookmarkEditor.
 void ShowBookmarkEditorViews(gfx::NativeWindow parent_window,

chrome/browser/ui/cocoa/login_handler_cocoa.mm

@@ -41,9 +41,10 @@ class LoginHandlerMac : public LoginHandler,
   LoginHandlerMac(
       net::AuthChallengeInfo* auth_info,
       content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-      const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-          auth_required_callback)
-      : LoginHandler(auth_info, web_contents_getter, auth_required_callback) {}
+      LoginAuthRequiredCallback auth_required_callback)
+      : LoginHandler(auth_info,
+                     web_contents_getter,
+                     std::move(auth_required_callback)) {}
 
   // LoginModelObserver implementation.
   void OnAutofillDataAvailableInternal(
@@ -139,14 +140,13 @@ class LoginHandlerMac : public LoginHandler,
 scoped_refptr<LoginHandler> LoginHandler::Create(
     net::AuthChallengeInfo* auth_info,
     content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-    const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-        auth_required_callback) {
+    LoginAuthRequiredCallback auth_required_callback) {
   if (chrome::ShowPilotDialogsWithViewsToolkit()) {
     return chrome::CreateLoginHandlerViews(auth_info, web_contents_getter,
-                                           auth_required_callback);
+                                           std::move(auth_required_callback));
   }
-  return base::MakeRefCounted<LoginHandlerMac>(auth_info, web_contents_getter,
-                                               auth_required_callback);
+  return base::MakeRefCounted<LoginHandlerMac>(
+      auth_info, web_contents_getter, std::move(auth_required_callback));
 }
 
 // ----------------------------------------------------------------------------

chrome/browser/ui/login/login_handler.cc

@@ -93,14 +93,13 @@ LoginHandler::LoginModelData::LoginModelData(
 LoginHandler::LoginHandler(
     net::AuthChallengeInfo* auth_info,
     content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-    const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-        auth_required_callback)
+    LoginAuthRequiredCallback auth_required_callback)
     : handled_auth_(false),
       auth_info_(auth_info),
       password_manager_(NULL),
       web_contents_getter_(web_contents_getter),
       login_model_(NULL),
-      auth_required_callback_(auth_required_callback),
+      auth_required_callback_(std::move(auth_required_callback)),
       has_shown_login_handler_(false),
       release_soon_has_been_called_(false) {
   // This constructor is called on the I/O thread, so we cannot load the nib
@@ -677,10 +676,9 @@ scoped_refptr<LoginHandler> CreateLoginPrompt(
     content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
     bool is_main_frame,
     const GURL& url,
-    const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-        auth_required_callback) {
+    LoginAuthRequiredCallback auth_required_callback) {
   scoped_refptr<LoginHandler> handler = LoginHandler::Create(
-      auth_info, web_contents_getter, auth_required_callback);
+      auth_info, web_contents_getter, std::move(auth_required_callback));
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::BindOnce(&LoginHandler::LoginDialogCallback, url,

chrome/browser/ui/login/login_handler.h

@@ -16,6 +16,7 @@
 #include "base/optional.h"
 #include "base/synchronization/lock.h"
 #include "components/password_manager/core/browser/password_manager.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/login_delegate.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/resource_request_info.h"
@@ -31,7 +32,6 @@ class WebContents;
 
 namespace net {
 class AuthChallengeInfo;
-class AuthCredentials;
 }  // namespace net
 
 // This is the base implementation for the OS-specific classes that route
@@ -59,16 +59,14 @@ class LoginHandler : public content::LoginDelegate,
   LoginHandler(
       net::AuthChallengeInfo* auth_info,
       content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-      const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-          auth_required_callback);
+      LoginAuthRequiredCallback auth_required_callback);
 
   // Builds the platform specific LoginHandler. Used from within
   // CreateLoginPrompt() which creates tasks.
   static scoped_refptr<LoginHandler> Create(
       net::AuthChallengeInfo* auth_info,
       content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-      const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-          auth_required_callback);
+      LoginAuthRequiredCallback auth_required_callback);
 
   void SetInterstitialDelegate(
       const base::WeakPtr<LoginInterstitialDelegate> delegate) {
@@ -150,8 +148,7 @@ class LoginHandler : public content::LoginDelegate,
       content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
       bool is_main_frame,
       const GURL& url,
-      const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-          auth_required_callback);
+      LoginAuthRequiredCallback auth_required_callback);
   FRIEND_TEST_ALL_PREFIXES(LoginHandlerTest, DialogStringsAndRealm);
 
   // Starts observing notifications from other LoginHandlers.
@@ -251,8 +248,7 @@ class LoginHandler : public content::LoginDelegate,
   // This is only accessed on the UI thread.
   std::unique_ptr<content::NotificationRegistrar> registrar_;
 
-  base::Callback<void(const base::Optional<net::AuthCredentials>&)>
-      auth_required_callback_;
+  LoginAuthRequiredCallback auth_required_callback_;
 
   base::WeakPtr<LoginInterstitialDelegate> interstitial_delegate_;
 
@@ -322,7 +318,6 @@ scoped_refptr<LoginHandler> CreateLoginPrompt(
     content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
     bool is_main_frame,
     const GURL& url,
-    const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-        auth_required_callback);
+    LoginAuthRequiredCallback auth_required_callback);
 
 #endif  // CHROME_BROWSER_UI_LOGIN_LOGIN_HANDLER_H_

chrome/browser/ui/views/browser_dialogs_views.cc

@@ -29,10 +29,9 @@
 scoped_refptr<LoginHandler> LoginHandler::Create(
     net::AuthChallengeInfo* auth_info,
     content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-    const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-        auth_required_callback) {
+    LoginAuthRequiredCallback auth_required_callback) {
   return chrome::CreateLoginHandlerViews(auth_info, web_contents_getter,
-                                         auth_required_callback);
+                                         std::move(auth_required_callback));
 }
 
 // static

chrome/browser/ui/views/login_handler_views.cc

@@ -32,9 +32,10 @@ class LoginHandlerViews : public LoginHandler, public views::DialogDelegate {
   LoginHandlerViews(
       net::AuthChallengeInfo* auth_info,
       content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-      const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-          auth_required_callback)
-      : LoginHandler(auth_info, web_contents_getter, auth_required_callback),
+      LoginAuthRequiredCallback auth_required_callback)
+      : LoginHandler(auth_info,
+                     web_contents_getter,
+                     std::move(auth_required_callback)),
         login_view_(nullptr),
         dialog_(nullptr) {
     chrome::RecordDialogCreation(chrome::DialogIdentifier::LOGIN_HANDLER);
@@ -163,10 +164,9 @@ namespace chrome {
 scoped_refptr<LoginHandler> CreateLoginHandlerViews(
     net::AuthChallengeInfo* auth_info,
     content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
-    const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-        auth_required_callback) {
-  return base::MakeRefCounted<LoginHandlerViews>(auth_info, web_contents_getter,
-                                                 auth_required_callback);
+    LoginAuthRequiredCallback auth_required_callback) {
+  return base::MakeRefCounted<LoginHandlerViews>(
+      auth_info, web_contents_getter, std::move(auth_required_callback));
 }
 
 }  // namespace chrome

content/browser/loader/resource_dispatcher_host_impl.cc

@@ -555,8 +555,8 @@ scoped_refptr<LoginDelegate> ResourceDispatcherHostImpl::CreateLoginDelegate(
       GetContentClient()->browser()->CreateLoginDelegate(
           auth_info, resource_request_info->GetWebContentsGetterForRequest(),
           is_main_frame, url, resource_request_info->first_auth_attempt(),
-          base::Bind(&ResourceDispatcherHostImpl::RunAuthRequiredCallback,
-                     base::Unretained(this), request_id));
+          base::BindOnce(&ResourceDispatcherHostImpl::RunAuthRequiredCallback,
+                         base::Unretained(this), request_id));
 
   resource_request_info->set_first_auth_attempt(false);
 

content/browser/network_service_client.cc

@@ -228,8 +228,8 @@ class LoginHandlerDelegate {
     login_delegate_ = GetContentClient()->browser()->CreateLoginDelegate(
         auth_info_.get(), web_contents_getter_, is_main_frame_, url_,
         first_auth_attempt_,
-        base::Bind(&LoginHandlerDelegate::RunAuthCredentials,
-                   base::Unretained(this)));
+        base::BindOnce(&LoginHandlerDelegate::RunAuthCredentials,
+                       base::Unretained(this)));
 
     if (!login_delegate_) {
       RunAuthCredentials(base::nullopt);

content/public/browser/content_browser_client.cc

@@ -703,8 +703,7 @@ scoped_refptr<LoginDelegate> ContentBrowserClient::CreateLoginDelegate(
     bool is_main_frame,
     const GURL& url,
     bool first_auth_attempt,
-    const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-        auth_required_callback) {
+    LoginAuthRequiredCallback auth_required_callback) {
   return nullptr;
 }
 

content/public/browser/content_browser_client.h

@@ -55,6 +55,8 @@
 #endif
 
 class GURL;
+using LoginAuthRequiredCallback =
+    base::OnceCallback<void(const base::Optional<net::AuthCredentials>&)>;
 
 namespace base {
 class CommandLine;
@@ -1151,8 +1153,7 @@ class CONTENT_EXPORT ContentBrowserClient {
       bool is_main_frame,
       const GURL& url,
       bool first_auth_attempt,
-      const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-          auth_required_callback);
+      LoginAuthRequiredCallback auth_required_callback);
 
   // Launches the url for the given tab. Returns true if an attempt to handle
   // the url was made, e.g. by launching an app. Note that this does not

content/shell/browser/layout_test/layout_test_content_browser_client.cc

@@ -248,8 +248,7 @@ LayoutTestContentBrowserClient::CreateLoginDelegate(
     bool is_main_frame,
     const GURL& url,
     bool first_auth_attempt,
-    const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-        auth_required_callback) {
+    LoginAuthRequiredCallback auth_required_callback) {
   return nullptr;
 }
 

content/shell/browser/layout_test/layout_test_content_browser_client.h

@@ -78,8 +78,7 @@ class LayoutTestContentBrowserClient : public ShellContentBrowserClient {
       bool is_main_frame,
       const GURL& url,
       bool first_auth_attempt,
-      const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-          auth_required_callback) override;
+      LoginAuthRequiredCallback auth_required_callback) override;
 
  private:
   // Creates and stores a FakeBluetoothChooser instance.

content/shell/browser/shell_content_browser_client.cc

@@ -355,8 +355,7 @@ scoped_refptr<LoginDelegate> ShellContentBrowserClient::CreateLoginDelegate(
     bool is_main_frame,
     const GURL& url,
     bool first_auth_attempt,
-    const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-        auth_required_callback) {
+    LoginAuthRequiredCallback auth_required_callback) {
   if (!login_request_callback_.is_null()) {
     std::move(login_request_callback_).Run();
     return nullptr;
@@ -366,8 +365,8 @@ scoped_refptr<LoginDelegate> ShellContentBrowserClient::CreateLoginDelegate(
   // TODO: implement ShellLoginDialog for other platforms, drop this #if
   return nullptr;
 #else
-  return base::MakeRefCounted<ShellLoginDialog>(auth_info,
-                                                auth_required_callback);
+  return base::MakeRefCounted<ShellLoginDialog>(
+      auth_info, std::move(auth_required_callback));
 #endif
 }
 

content/shell/browser/shell_content_browser_client.h

@@ -75,8 +75,7 @@ class ShellContentBrowserClient : public ContentBrowserClient {
       bool is_main_frame,
       const GURL& url,
       bool first_auth_attempt,
-      const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&
-          auth_required_callback) override;
+      LoginAuthRequiredCallback auth_required_callback) override;
 
 #if defined(OS_LINUX) || defined(OS_ANDROID)
   void GetAdditionalMappedFilesForChildProcess(

content/shell/browser/shell_login_dialog.cc

@@ -17,9 +17,8 @@ namespace content {
 
 ShellLoginDialog::ShellLoginDialog(
     net::AuthChallengeInfo* auth_info,
-    base::Callback<void(const base::Optional<net::AuthCredentials>&)>
-        auth_required_callback)
-    : auth_required_callback_(auth_required_callback) {
+    LoginAuthRequiredCallback auth_required_callback)
+    : auth_required_callback_(std::move(auth_required_callback)) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,

content/shell/browser/shell_login_dialog.h

@@ -10,6 +10,7 @@
 #include "base/optional.h"
 #include "base/strings/string16.h"
 #include "build/build_config.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/login_delegate.h"
 
 #if defined(OS_MACOSX)
@@ -22,7 +23,6 @@ class ShellLoginDialogHelper;
 
 namespace net {
 class AuthChallengeInfo;
-class AuthCredentials;
 }
 
 namespace content {
@@ -34,7 +34,7 @@ class ShellLoginDialog : public LoginDelegate {
   // Threading: IO thread.
   ShellLoginDialog(
       net::AuthChallengeInfo* auth_info,
-      base::Callback<void(const base::Optional<net::AuthCredentials>&)>
+      base::OnceCallback<void(const base::Optional<net::AuthCredentials>&)>
           auth_required_callback);
 
   // LoginDelegate implementation:
@@ -76,8 +76,7 @@ class ShellLoginDialog : public LoginDelegate {
                            const base::string16& username,
                            const base::string16& password);
 
-  base::Callback<void(const base::Optional<net::AuthCredentials>&)>
-      auth_required_callback_;
+  LoginAuthRequiredCallback auth_required_callback_;
 
 #if defined(OS_MACOSX)
   // Threading: UI thread.