Always Close the Autofill UI through the same path

chrome/browser/autofill/autofill_external_delegate_browsertest.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/memory/scoped_ptr.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/autofill/test_autofill_external_delegate.h"
 #include "chrome/browser/ui/autofill/autofill_popup_controller_impl.h"
 #include "chrome/browser/ui/autofill/autofill_popup_view.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 66 matching lines @@
 
   virtual void SetUpOnMainThread() OVERRIDE {
     web_contents_ = browser()->tab_strip_model()->GetActiveWebContents();
     ASSERT_TRUE(web_contents_ != NULL);
     Observe(web_contents_);
 
     autofill_external_delegate_.reset(
         new MockAutofillExternalDelegate(web_contents_));
   }
 
-  // Normally the WebContents will automatically delete the delegate, but here
-  // the delegate is owned by this test, so we have to manually destroy.
-  virtual void WebContentsDestroyed(content::WebContents* web_contents)
-      OVERRIDE {
-    DCHECK_EQ(web_contents_, web_contents);
-    autofill_external_delegate_.reset();
-  }
-
  protected:
   content::WebContents* web_contents_;
   scoped_ptr<MockAutofillExternalDelegate> autofill_external_delegate_;
 };
 
 IN_PROC_BROWSER_TEST_F(AutofillExternalDelegateBrowserTest,
                        SwitchTabAndHideAutofillPopup) {
   autofill::GenerateTestAutofillPopup(autofill_external_delegate_.get());
 
   content::WindowedNotificationObserver observer(
@@ skipping 30 matching lines @@
 // Tests that closing the widget does not leak any resources.  This test is
 // only really meaningful when run on the memory bots.
 IN_PROC_BROWSER_TEST_F(AutofillExternalDelegateBrowserTest,
                        CloseWidgetAndNoLeaking) {
   autofill::GenerateTestAutofillPopup(autofill_external_delegate_.get());
 
   // Delete the view from under the delegate to ensure that the
   // delegate and the controller can handle the popup getting deleted elsewhere.
   autofill_external_delegate_->GetController()->view()->Hide();
 }