Factoring duplicate code from platform-specific LoginHandlers into a base ...

chrome/browser/login_prompt_win.cc

Index: chrome/browser/login_prompt_win.cc
===================================================================
--- chrome/browser/login_prompt_win.cc	(revision 42281)
+++ chrome/browser/login_prompt_win.cc	(working copy)
@@ -29,22 +29,15 @@
 // This class uses ref counting to ensure that it lives until all InvokeLaters
 // have been called.
 class LoginHandlerWin : public LoginHandler,
-                        public base::RefCountedThreadSafe<LoginHandlerWin>,
                         public views::DialogDelegate {
  public:
-  explicit LoginHandlerWin(URLRequest* request)
-      : dialog_(NULL),
-        handled_auth_(false),
-        request_(request),
-        password_manager_(NULL) {
-    DCHECK(request_) << "LoginHandler constructed with NULL request";
+  explicit LoginHandlerWin(URLRequest* request) : LoginHandler(request) {
+  }
 
-    AddRef();  // matched by ReleaseLater.
-    if (!ResourceDispatcherHost::RenderViewForRequest(request_,
-                                                      &render_process_host_id_,
-                                                      &tab_contents_id_)) {
-      NOTREACHED();
-    }
+  // LoginModelObserver implementation.
+  virtual void OnAutofillDataAvailable(const std::wstring& username,
+                                       const std::wstring& password) {
+    // Nothing to do here since LoginView takes care of autofil for win.
   }
 
   void set_login_view(LoginView* login_view) {
@@ -58,9 +51,11 @@
       return l10n_util::GetString(IDS_LOGIN_DIALOG_OK_BUTTON_LABEL);
     return DialogDelegate::GetDialogButtonLabel(button);
   }
+
   virtual std::wstring GetWindowTitle() const {
     return l10n_util::GetString(IDS_LOGIN_DIALOG_TITLE);
   }
+
   virtual void WindowClosing() {
     DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
 
@@ -69,31 +64,35 @@
       tab->render_view_host()->set_ignore_input_events(false);
 
     // Reference is no longer valid.
-    dialog_ = NULL;
+    SetDialog(NULL);
 
-    if (!WasAuthHandled(true)) {
-      ChromeThread::PostTask(
-          ChromeThread::IO, FROM_HERE,
-          NewRunnableMethod(this, &LoginHandlerWin::CancelAuthDeferred));
-      SendNotifications();
-    }
+    CancelAuth();
   }
+
   virtual void DeleteDelegate() {
-    // Delete this object once all InvokeLaters have been called.
-    ChromeThread::ReleaseSoon(ChromeThread::IO, FROM_HERE, this);
+    DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
+
+    // The constrained window is going to delete itself; clear our pointer.
+    SetDialog(NULL);
+    SetModel(NULL);
+
+    ReleaseSoon();
   }
+
   virtual bool Cancel() {
     DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
-    DCHECK(dialog_) << "LoginHandler invoked without being attached";
+
     CancelAuth();
     return true;
   }
+
   virtual bool Accept() {
     DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
-    DCHECK(dialog_) << "LoginHandler invoked without being attached";
+
     SetAuth(login_view_->GetUsername(), login_view_->GetPassword());
     return true;
   }
+
   virtual views::View* GetContentsView() {
     return login_view_;
   }
@@ -119,177 +118,19 @@
     // 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).
-    dialog_ = GetTabContentsForLogin()->CreateConstrainedDialog(this);
+    SetDialog(GetTabContentsForLogin()->CreateConstrainedDialog(this));
     SendNotifications();
   }
 
-  virtual void SetPasswordForm(const webkit_glue::PasswordForm& form) {
-    password_form_ = form;
-  }
-
-  virtual void SetPasswordManager(PasswordManager* password_manager) {
-    password_manager_ = password_manager;
-  }
-
-  virtual TabContents* GetTabContentsForLogin() {
-    DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
-
-    return tab_util::GetTabContentsByID(render_process_host_id_,
-                                        tab_contents_id_);
-  }
-
-  virtual void SetAuth(const std::wstring& username,
-                       const std::wstring& password) {
-    if (WasAuthHandled(true))
-      return;
-
-    // Tell the password manager the credentials were submitted / accepted.
-    if (password_manager_) {
-      password_form_.username_value = username;
-      password_form_.password_value = password;
-      password_manager_->ProvisionallySavePassword(password_form_);
-    }
-
-    ChromeThread::PostTask(
-        ChromeThread::UI, FROM_HERE,
-        NewRunnableMethod(this, &LoginHandlerWin::CloseContentsDeferred));
-    ChromeThread::PostTask(
-        ChromeThread::UI, FROM_HERE,
-        NewRunnableMethod(this, &LoginHandlerWin::SendNotifications));
-    ChromeThread::PostTask(
-        ChromeThread::IO, FROM_HERE,
-        NewRunnableMethod(
-            this, &LoginHandlerWin::SetAuthDeferred, username, password));
-  }
-
-  virtual void CancelAuth() {
-    if (WasAuthHandled(true))
-      return;
-
-    ChromeThread::PostTask(
-        ChromeThread::UI, FROM_HERE,
-        NewRunnableMethod(this, &LoginHandlerWin::CloseContentsDeferred));
-    ChromeThread::PostTask(
-        ChromeThread::UI, FROM_HERE,
-        NewRunnableMethod(this, &LoginHandlerWin::SendNotifications));
-    ChromeThread::PostTask(
-        ChromeThread::IO, FROM_HERE,
-        NewRunnableMethod(this, &LoginHandlerWin::CancelAuthDeferred));
-  }
-
-  virtual void OnRequestCancelled() {
-    DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO)) <<
-        "Why is OnRequestCancelled called from the UI thread?";
-
-    // Reference is no longer valid.
-    request_ = NULL;
-
-    // Give up on auth if the request was cancelled.
-    CancelAuth();
-  }
-
  private:
   friend class base::RefCountedThreadSafe<LoginHandlerWin>;
   friend class LoginPrompt;
 
   ~LoginHandlerWin() {}
 
-  // Calls SetAuth from the IO loop.
-  void SetAuthDeferred(const std::wstring& username,
-                       const std::wstring& password) {
-    DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
-
-    if (request_) {
-      request_->SetAuth(username, password);
-      ResetLoginHandlerForRequest(request_);
-    }
-  }
-
-  // Calls CancelAuth from the IO loop.
-  void CancelAuthDeferred() {
-    DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
-
-    if (request_) {
-      request_->CancelAuth();
-      // Verify that CancelAuth does destroy the request via our delegate.
-      DCHECK(request_ != NULL);
-      ResetLoginHandlerForRequest(request_);
-    }
-  }
-
-  // Closes the view_contents from the UI loop.
-  void CloseContentsDeferred() {
-    DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
-
-    // The hosting ConstrainedWindow may have been freed.
-    if (dialog_)
-      dialog_->CloseConstrainedWindow();
-  }
-
-  // Returns whether authentication had been handled (SetAuth or CancelAuth).
-  // If |set_handled| is true, it will mark authentication as handled.
-  bool WasAuthHandled(bool set_handled) {
-    AutoLock lock(handled_auth_lock_);
-    bool was_handled = handled_auth_;
-    if (set_handled)
-      handled_auth_ = true;
-    return was_handled;
-  }
-
-  // Notify observers that authentication is needed or received.  The automation
-  // proxy uses this for testing.
-  void SendNotifications() {
-    DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
-
-    NotificationService* service = NotificationService::current();
-    TabContents* requesting_contents = GetTabContentsForLogin();
-    if (!requesting_contents)
-      return;
-
-    NavigationController* controller = &requesting_contents->controller();
-
-    if (!WasAuthHandled(false)) {
-      LoginNotificationDetails details(this);
-      service->Notify(NotificationType::AUTH_NEEDED,
-                      Source<NavigationController>(controller),
-                      Details<LoginNotificationDetails>(&details));
-    } else {
-      service->Notify(NotificationType::AUTH_SUPPLIED,
-                      Source<NavigationController>(controller),
-                      NotificationService::NoDetails());
-    }
-  }
-
-  // True if we've handled auth (SetAuth or CancelAuth has been called).
-  bool handled_auth_;
-  Lock handled_auth_lock_;
-
-  // The ConstrainedWindow that is hosting our LoginView.
-  // This should only be accessed on the UI loop.
-  ConstrainedWindow* dialog_;
-
-  // The request that wants login data.
-  // This should only be accessed on the IO loop.
-  URLRequest* request_;
-
   // The LoginView that contains the user's login information
   LoginView* login_view_;
 
-  // The PasswordForm sent to the PasswordManager. This is so we can refer to it
-  // when later notifying the password manager if the credentials were accepted
-  // or rejected.
-  // This should only be accessed on the UI loop.
-  PasswordForm password_form_;
-
-  // Points to the password manager owned by the TabContents requesting auth.
-  // Can be null if the TabContents is not a TabContents.
-  // This should only be accessed on the UI loop.
-  PasswordManager* password_manager_;
-
-  // Cached from the URLRequest, in case it goes NULL on us.
-  int render_process_host_id_;
-  int tab_contents_id_;
-
   DISALLOW_COPY_AND_ASSIGN(LoginHandlerWin);
 };