Always Close the Autofill UI through the same path

chrome/browser/ui/autofill/autofill_popup_controller_impl.h

Index: chrome/browser/ui/autofill/autofill_popup_controller_impl.h
diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_impl.h b/chrome/browser/ui/autofill/autofill_popup_controller_impl.h
index e16ac31ba6708b831db9ae77f0e8adfbba06cf39..b37fca7033d84685fa86dfb2868bff4b1c6d5e11 100644
--- a/chrome/browser/ui/autofill/autofill_popup_controller_impl.h
+++ b/chrome/browser/ui/autofill/autofill_popup_controller_impl.h
@@ -47,8 +47,8 @@ class AutofillPopupControllerImpl : public AutofillPopupController,
             const std::vector<int>& identifiers);
 
   // Hides the popup and destroys the controller. This also invalidates
-  // |delegate_|. Virtual for testing.
-  virtual void Hide();
+  // |delegate_|.
+  virtual void Hide() OVERRIDE;
 
   // KeyboardListener implementation.
   virtual bool HandleKeyPressEvent(
@@ -64,7 +64,6 @@ class AutofillPopupControllerImpl : public AutofillPopupController,
   virtual ~AutofillPopupControllerImpl();
 
   // AutofillPopupController implementation.
-  virtual void ViewDestroyed() OVERRIDE;
   virtual void UpdateBoundsAndRedrawPopup() OVERRIDE;
   virtual void MouseHovered(int x, int y) OVERRIDE;
   virtual void MouseClicked(int x, int y) OVERRIDE;
@@ -203,8 +202,10 @@ class AutofillPopupControllerImpl : public AutofillPopupController,
   // Used to indicate if the delete icon within a row is currently selected.
   bool delete_icon_hovered_;
 
-  // True if |HideInternal| has already been called.
-  bool is_hiding_;
+  // Used to check that the hide function was called, to check that the class
+  // is only destroyed through the Hide function. Remove after Dev channel
+  // release.
+  bool hide_called_;

[Ilya Sherman, 2013/02/28 00:22:04]

I meant that you should do this for each of the views, not for the controller. 
The controller definitely owns itself, and it's easy to verify that there's only
one "delete this" call.  The ownership model for the views is a bit more
complicated, and are where I think CHECK(hide_called_) would provide value.

[csharp, 2013/03/04 22:22:03]

Right, fixed.

 
   base::WeakPtrFactory<AutofillPopupControllerImpl> weak_ptr_factory_;
 };