Re-land r248110 with ASAN error fixed.

chrome/browser/ui/autofill/password_generation_popup_controller_impl.cc

 // Copyright 2014 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.
 
 #include "chrome/browser/ui/autofill/password_generation_popup_controller_impl.h"
 
 #include <math.h>
 
 #include "base/strings/utf_string_conversion_utils.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 87 matching lines @@
   switch (event.windowsKeyCode) {
     case ui::VKEY_UP:
     case ui::VKEY_DOWN:
       PasswordSelected(true);
       return true;
     case ui::VKEY_ESCAPE:
       Hide();
       return true;
     case ui::VKEY_RETURN:
     case ui::VKEY_TAB:
       // We supress tab if the password is selected because we will

[Evan Stade, 2014/01/31 21:55:55]

suppress

[Garrett Casto, 2014/01/31 22:01:41]

Done.

       // automatically advance focus anyway.
-      return PossiblyAcceptPassword();
+      if (PossiblyAcceptPassword()) {
+        Hide();
+        return true;
+      } else {
+        return false;
+      }
     default:
       return false;
   }
 }
 
 bool PasswordGenerationPopupControllerImpl::PossiblyAcceptPassword() {
   if (password_selected_)
     PasswordAccepted();

[Evan Stade, 2014/01/31 21:55:55]

could you fix this by instead changing this function to:

if (password_selected_) {
  PasswordAccepted();  // This will delete |this|.
  return true;
}

return false;

[Garrett Casto, 2014/01/31 22:01:41]

Done.

 
   return password_selected_;
 }
 
 void PasswordGenerationPopupControllerImpl::PasswordSelected(bool selected) {
   password_selected_ = selected;
   view_->UpdateBoundsAndRedrawPopup();
 }
 
 void PasswordGenerationPopupControllerImpl::PasswordAccepted() {
   web_contents()->GetRenderViewHost()->Send(
       new AutofillMsg_GeneratedPasswordAccepted(
           web_contents()->GetRenderViewHost()->GetRoutingID(),
           current_password_));
   password_manager_->SetFormHasGeneratedPassword(form_);
-  Hide();
 }
 
 int PasswordGenerationPopupControllerImpl::GetDesiredWidth() {
   // Minimum width we want to display the password.
   int minimum_length_for_text = 2 * kHorizontalPadding +
       font_.GetExpectedTextWidth(kMinimumWidth) +
       2 * kPopupBorderThickness;
 
   // If the width of the field is longer than the minimum, use that instead.
   return std::max(minimum_length_for_text,
@@ skipping 55 matching lines @@
     view_ = PasswordGenerationPopupView::Create(this);
     view_->Show();
   }
 
   controller_common_.RegisterKeyPressCallback();
 
   if (observer_)
     observer_->OnPopupShown();
 }
 
+void PasswordGenerationPopupControllerImpl::HideAndDestroy() {
+  Hide();
+}
+
 void PasswordGenerationPopupControllerImpl::Hide() {
   controller_common_.RemoveKeyPressCallback();
 
   if (view_)
     view_->Hide();
 
   if (observer_)
     observer_->OnPopupHidden();
 
   delete this;
@@ skipping 15 matching lines @@
 }
 
 void PasswordGenerationPopupControllerImpl::SetSelectionAtPoint(
     const gfx::Point& point) {
   if (password_bounds_.Contains(point))
     PasswordSelected(true);
 }
 
 void PasswordGenerationPopupControllerImpl::AcceptSelectionAtPoint(
     const gfx::Point& point) {
-  if (password_bounds_.Contains(point))
+  if (password_bounds_.Contains(point)) {
     PasswordAccepted();
+    Hide();
+  }
 }
 
 void PasswordGenerationPopupControllerImpl::SelectionCleared() {
   PasswordSelected(false);
 }
 
 bool PasswordGenerationPopupControllerImpl::ShouldRepostEvent(
     const ui::MouseEvent& event) {
   return false;
 }
@@ skipping 35 matching lines @@
 
 base::string16 PasswordGenerationPopupControllerImpl::HelpText() {
   return l10n_util::GetStringUTF16(IDS_PASSWORD_GENERATION_PROMPT);
 }
 
 base::string16 PasswordGenerationPopupControllerImpl::LearnMoreLink() {
   return l10n_util::GetStringUTF16(IDS_PASSWORD_GENERATION_LEARN_MORE_LINK);
 }
 
 }  // namespace autofill