Move the UI related code from AutofillExternalDelegate to AutofillManagerDelegate

chrome/browser/autofill/autofill_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 <string>
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 185 matching lines @@
     // events to the popup directly.
     content::WebContents* web_contents =
         browser()->tab_strip_model()->GetActiveWebContents();
     AutofillManager* autofill_manager =
         AutofillManager::FromWebContents(web_contents);
     external_delegate_.reset(
         new TestAutofillExternalDelegate(web_contents, autofill_manager));
     autofill_manager->SetExternalDelegate(external_delegate_.get());
   }
 
-  virtual void CleanUpOnMainThread() OVERRIDE {
-    // Tear down the test external delegate while the UI is still up, as it
-    // might try to close the active popup if there still is one.
-    content::WebContents* web_contents =
-        browser()->tab_strip_model()->GetActiveWebContents();
-    AutofillManager::FromWebContents(web_contents)->SetExternalDelegate(NULL);
-    external_delegate_.reset();
-  }
-
   PersonalDataManager* personal_data_manager() {
     return PersonalDataManagerFactory::GetForProfile(browser()->profile());
   }
 
   void CreateTestProfile() {
     AutofillProfile profile;
     autofill_test::SetProfileInfo(
         &profile, "Milton", "C.", "Waddams",
         "red.swingline@initech.com", "Initech", "4120 Freidrich Lane",
         "Basement", "Austin", "Texas", "78744", "United States", "5125551234");
@@ skipping 1447 matching lines @@
 // TODO(isherman): this looks redundant, consider removing.
 // DISABLED: http://crbug.com/150084
 IN_PROC_BROWSER_TEST_F(AutofillTest,
                        DISABLED_MergeAggregatedDuplicatedProfiles) {
   int num_of_profiles =
       AggregateProfilesIntoAutofillPrefs("dataset_no_address.txt");
 
   ASSERT_GT(num_of_profiles,
             static_cast<int>(personal_data_manager()->GetProfiles().size()));
 }