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

chrome/browser/ui/cocoa/login_prompt_cocoa.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/login_prompt_cocoa.h"
 
 #include "base/mac/bundle_locations.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
@@ skipping 23 matching lines @@
 // This class uses ref counting to ensure that it lives until all InvokeLaters
 // have been called.
 class LoginHandlerMac : public LoginHandler,
                         public ConstrainedWindowMacDelegate {
  public:
   LoginHandlerMac(net::AuthChallengeInfo* auth_info, net::URLRequest* request)
       : LoginHandler(auth_info, request) {
   }
 
   // LoginModelObserver implementation.
-  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);
 
     [sheet_controller_ autofillLogin:base::SysUTF16ToNSString(username)
                             password:base::SysUTF16ToNSString(password)];
   }
   void OnLoginModelDestroying() override {}
 
   // LoginHandler:
-  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);
 
     sheet_controller_.reset(
         [[LoginHandlerSheet alloc] initWithLoginHandler:this]);
 
-    SetModel(manager);
+    if (login_model_data)
+      SetModel(*login_model_data);
+    else
+      ResetModel();
 
     [sheet_controller_ setExplanation:base::SysUTF16ToNSString(explanation)];
 
     // Scary thread safety note: This can potentially be called *after* SetAuth
     // or CancelAuth (say, if the request was cancelled before the UI thread got
     // control).  However, that's OK since any UI interaction in those functions
     // will occur via an InvokeLater on the UI thread, which is guaranteed
     // to happen after this is called (since this was InvokeLater'd first).
     WebContents* requesting_contents = GetWebContentsForLogin();
     DCHECK(requesting_contents);
 
     base::scoped_nsobject<CustomConstrainedWindowSheet> sheet(
         [[CustomConstrainedWindowSheet alloc]
             initWithCustomWindow:[sheet_controller_ window]]);
     constrained_window_.reset(new ConstrainedWindowMac(
         this, requesting_contents, sheet));
 
     NotifyAuthNeeded();
   }
 
   void CloseDialog() override {
     // The hosting dialog may have been freed.
     if (constrained_window_)
       constrained_window_->CloseWebContentsModalDialog();
   }
 
   // Overridden from ConstrainedWindowMacDelegate:
   void OnConstrainedWindowClosed(ConstrainedWindowMac* window) override {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
-    SetModel(NULL);
+    ResetModel();
     ReleaseSoon();
 
     constrained_window_.reset();
     sheet_controller_.reset();
   }
 
   void OnLoginPressed(const base::string16& username,
                       const base::string16& password) {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
     SetAuth(username, password);
@@ skipping 81 matching lines @@
   // Resize the text field.
   CGFloat windowDelta = [GTMUILocalizerAndLayoutTweaker
        sizeToFitFixedWidthTextField:explanationField_];
 
   NSRect newFrame = [[self window] frame];
   newFrame.size.height += windowDelta;
   [[self window] setFrame:newFrame display:NO];
 }
 
 @end