Always Close the Autofill UI through the same path

chrome/browser/ui/autofill/autofill_popup_controller_unittest.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 "base/memory/weak_ptr.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_external_delegate.h"
 #include "chrome/browser/autofill/autofill_manager.h"
@@ skipping 305 matching lines @@
       AutofillPopupControllerImpl::GetOrCreate(
           test_controller->GetWeakPtr(),
           &delegate,
           NULL,
           bounds);
   EXPECT_EQ(
       bounds,
       static_cast<AutofillPopupController*>(controller3)->element_bounds());
   controller3->Hide();
 
-  delete test_controller;
+  // Hide the test_controller to delete it.
+  test_controller->DoHide();
 }
 
 #if !defined(OS_ANDROID)
 TEST_F(AutofillPopupControllerUnitTest, ElideText) {
   std::vector<string16> names;
   names.push_back(ASCIIToUTF16("Text that will need to be trimmed"));
   names.push_back(ASCIIToUTF16("Untrimmed"));
 
   std::vector<string16> subtexts;
   subtexts.push_back(ASCIIToUTF16("Label that will be trimmed"));
@@ skipping 89 matching lines @@
     autofill_popup_controller->Show(names, names, names, autofill_ids);
 
     EXPECT_EQ(expected_popup_bounds[i].ToString(),
               autofill_popup_controller->popup_bounds().ToString()) <<
         "Popup bounds failed to match for test " << i;
 
     // Hide the controller to delete it.
     autofill_popup_controller->DoHide();
   }
 }