[Merge in M47] Do not involve PasswordManagerDriver in filling HTTP-auth forms; also check realm

chrome/browser/ui/android/login_prompt_android.cc

Index: chrome/browser/ui/android/login_prompt_android.cc
diff --git a/chrome/browser/ui/android/login_prompt_android.cc b/chrome/browser/ui/android/login_prompt_android.cc
index 7f478bf011463d244566bd656eda56b6c559b34f..367cb2c4d7086e2ebac97c74911614b169db43b7 100644
--- a/chrome/browser/ui/android/login_prompt_android.cc
+++ b/chrome/browser/ui/android/login_prompt_android.cc
@@ -10,7 +10,6 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/android/chrome_http_auth_handler.h"
 #include "chrome/browser/ui/android/window_android_helper.h"
-#include "chrome/browser/ui/login/login_prompt.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/auth.h"
@@ -28,8 +27,9 @@ class LoginHandlerAndroid : public LoginHandler {
 
   // LoginHandler methods:
 
-  void OnAutofillDataAvailable(const base::string16& username,
-                               const base::string16& password) override {
+  void OnAutofillDataAvailableInternal(
+      const base::string16& username,
+      const base::string16& password) override {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
     DCHECK(chrome_http_auth_handler_.get() != NULL);
     chrome_http_auth_handler_->OnAutofillDataAvailable(
@@ -37,8 +37,8 @@ class LoginHandlerAndroid : public LoginHandler {
   }
   void OnLoginModelDestroying() override {}
 
-  void BuildViewForPasswordManager(password_manager::PasswordManager* manager,
-                                   const base::string16& explanation) override {
+  void BuildView(const base::string16& explanation,
+                 LoginModelData* login_model_data) override {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
     // Get pointer to TabAndroid
@@ -55,8 +55,11 @@ class LoginHandlerAndroid : public LoginHandler {
       chrome_http_auth_handler_->ShowDialog(
           window_helper->GetWindowAndroid()->GetJavaObject().obj());
 
-      // Register to receive a callback to OnAutofillDataAvailable().
-      SetModel(manager);
+      if (login_model_data)
+        SetModel(*login_model_data);
+      else
+        ResetModel();
+
       NotifyAuthNeeded();
     } else {
       CancelAuth();