Properly Remove Autofill Keyboard Listener.

chrome/browser/autofill/autofill_external_delegate.cc

 // 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.
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autocomplete_history_manager.h"
 #include "chrome/browser/autofill/autofill_external_delegate.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/ui/autofill/autofill_popup_controller_impl.h"
 #include "chrome/common/autofill_messages.h"
@@ skipping 46 matching lines @@
     registrar_.Add(
         this,
         content::NOTIFICATION_NAV_ENTRY_COMMITTED,
         content::Source<content::NavigationController>(
             &(web_contents->GetController())));
   }
 }
 
 AutofillExternalDelegate::~AutofillExternalDelegate() {
   if (controller_)
     controller_->Hide();

[David Trainor- moved to gerrit, 2013/02/12 21:13:36]

Should we just call HideAutofillPopup() here to make sure we properly deregister
the listener?

[Ilya Sherman, 2013/02/12 21:15:25]

Yeah, probably a good idea.

[csharp, 2013/02/12 21:15:28]

No longer needed, Hide will properly deregister the listener

 }
 
 void AutofillExternalDelegate::OnQuery(int query_id,
                                        const FormData& form,
                                        const FormFieldData& field,
                                        const gfx::RectF& element_bounds,
                                        bool display_warning_if_disabled) {
   autofill_query_form_ = form;
   autofill_query_field_ = field;
   display_warning_if_disabled_ = display_warning_if_disabled;
@@ skipping 194 matching lines @@
   if (web_contents_) {
     RenderViewHost* host = web_contents_->GetRenderViewHost();
 
     if (host)
       host->Send(new AutofillMsg_ClearPreviewedForm(host->GetRoutingID()));
   }
 }
 
 void AutofillExternalDelegate::HideAutofillPopup() {
   if (controller_) {
+    OnPopupHidden(controller_.get());
+    // Hide deletes the controller so all other actions must be done before it.
     controller_->Hide();
-    OnPopupHidden(controller_.get());
   }
 }
 
 void AutofillExternalDelegate::Reset() {
   HideAutofillPopup();
 
   password_autofill_manager_.Reset();
 }
 
 void AutofillExternalDelegate::AddPasswordFormMapping(
@@ skipping 122 matching lines @@
     const content::NotificationDetails& details) {
   if (type == content::NOTIFICATION_WEB_CONTENTS_VISIBILITY_CHANGED) {
     if (!*content::Details<bool>(details).ptr())
       HideAutofillPopup();
   } else if (type == content::NOTIFICATION_NAV_ENTRY_COMMITTED) {
     HideAutofillPopup();
   } else {
     NOTREACHED();
   }
 }