Follow-up clean-up in LoginHandler

chrome/browser/ui/login/login_prompt.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_LOGIN_LOGIN_PROMPT_H_
 #define CHROME_BROWSER_UI_LOGIN_LOGIN_PROMPT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/synchronization/lock.h"
 #include "components/password_manager/core/browser/password_manager.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/resource_dispatcher_host_login_delegate.h"
 
 class GURL;
 
 namespace content {
 class RenderViewHostDelegate;
 class NotificationRegistrar;
 class WebContents;
 }  // namespace content
 
 namespace net {
 class AuthChallengeInfo;
 class HttpNetworkSession;
 class URLRequest;
 }  // namespace net
 
-namespace password_manager {
-class ContentPasswordManagerDriver;
-}  // namespace password_manager
-
 // This is the base implementation for the OS-specific classes that route
 // authentication info to the net::URLRequest that needs it. These functions
 // must be implemented in a thread safe manner.
 class LoginHandler : public content::ResourceDispatcherHostLoginDelegate,
                      public password_manager::LoginModelObserver,
                      public content::NotificationObserver {
  public:
-  // The purpose of this struct is to enforce that BuildView receives either
+  // The purpose of this struct is to enforce that BuildViewImpl receives either
   // both the login model and the observed form, or none. That is a bit spoiled
   // by the fact that the model is a pointer to LoginModel, as opposed to a
   // reference. Having it as a reference would go against the style guide, which
   // forbids non-const references in arguments, presumably also inside passed
   // structs, because the guide's rationale still applies. Therefore at least
   // the constructor DCHECKs that |login_model| is not null.
   struct LoginModelData {
     LoginModelData(password_manager::LoginModel* login_model,
                    const autofill::PasswordForm& observed_form);
 
     password_manager::LoginModel* const model;
     const autofill::PasswordForm& form;
   };
 
   LoginHandler(net::AuthChallengeInfo* auth_info, net::URLRequest* request);
 
   // Builds the platform specific LoginHandler. Used from within
   // CreateLoginPrompt() which creates tasks.
   static LoginHandler* Create(net::AuthChallengeInfo* auth_info,
                               net::URLRequest* request);
 
   // ResourceDispatcherHostLoginDelegate implementation:
   void OnRequestCancelled() override;
 
-  // Implement this to initialize the underlying platform specific view. If
-  // |login_model_data| is not null, the contained LoginModel and PasswordForm
-  // can be used to register the view.
-  virtual void BuildView(const base::string16& explanation,
-                         LoginModelData* login_model_data) = 0;
+  // Use this to build a view with password manager support. |password_manager|
+  // must not be null.
+  void BuildViewWithPasswordManager(
+      const base::string16& explanation,
+      password_manager::PasswordManager* password_manager,
+      const autofill::PasswordForm& observed_form);
+
+  // Use this to build a view without password manager support.
+  void BuildViewWithoutPasswordManager(const base::string16& explanation);
 
   // Sets information about the authentication type (|form|) and the
   // |password_manager| for this profile.
   void SetPasswordForm(const autofill::PasswordForm& form);
   void SetPasswordManager(password_manager::PasswordManager* password_manager);
 
   // Returns the WebContents that needs authentication.
   content::WebContents* GetWebContentsForLogin() const;
 
   // Returns the PasswordManager for the web contents that needs login.
@@ skipping 17 matching lines @@
 
   // Who/where/what asked for the authentication.
   const net::AuthChallengeInfo* auth_info() const { return auth_info_.get(); }
 
   // Returns whether authentication had been handled (SetAuth or CancelAuth).
   bool WasAuthHandled() const;
 
  protected:
   ~LoginHandler() override;
 
+  // Implement this to initialize the underlying platform specific view. If
+  // |login_model_data| is not null, the contained LoginModel and PasswordForm
+  // can be used to register the view.
+  virtual void BuildViewImpl(const base::string16& explanation,
+                             LoginModelData* login_model_data) = 0;
+
   // Sets |model_data.model| as |login_model_| and registers |this| as an
   // observer for |model_data.form|-related events.
   void SetModel(LoginModelData model_data);
 
-  // Clear |login_model_| and remove |this| as an observer.
+  // Clears |login_model_| and removes |this| as an observer.
   void ResetModel();
 
   // Notify observers that authentication is needed.
   void NotifyAuthNeeded();
 
   // Performs necessary cleanup before deletion.
   void ReleaseSoon();
 
   // Closes the native dialog.
   virtual void CloseDialog() = 0;
@@ skipping 108 matching lines @@
 // net::URLRequest::Delegate::OnAuthRequired.  The prompt will be created
 // on the main UI thread via a call to UI loop's InvokeLater, and will send the
 // credentials back to the net::URLRequest on the calling thread.
 // A LoginHandler object (which lives on the calling thread) is returned,
 // which can be used to set or cancel authentication programmatically.  The
 // caller must invoke OnRequestCancelled() on this LoginHandler before
 // destroying the net::URLRequest.
 LoginHandler* CreateLoginPrompt(net::AuthChallengeInfo* auth_info,
                                 net::URLRequest* request);
 
-// Helper to remove the ref from an net::URLRequest to the LoginHandler.
-// Should only be called from the IO thread, since it accesses an
-// net::URLRequest.
-void ResetLoginHandlerForRequest(net::URLRequest* request);
-
 // Get the signon_realm under which the identity should be saved.
 std::string GetSignonRealm(const GURL& url,
                            const net::AuthChallengeInfo& auth_info);
 
 #endif  // CHROME_BROWSER_UI_LOGIN_LOGIN_PROMPT_H_