Relands "Removed InProcessBrowserTest::CleanUpOnMainThread()"

chrome/browser/password_manager/password_generation_interactive_uitest.cc

 // Copyright 2014 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/command_line.h"
 #include "chrome/browser/password_manager/chrome_password_manager_client.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/autofill/password_generation_popup_observer.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ skipping 56 matching lines @@
     // Set observer for popup.
     ChromePasswordManagerClient* client =
         ChromePasswordManagerClient::FromWebContents(GetWebContents());
     client->SetTestObserver(&observer_);
 
     ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
     GURL url = embedded_test_server()->GetURL("/password/signup_form.html");
     ui_test_utils::NavigateToURL(browser(), url);
   }
 
-  virtual void CleanUpOnMainThread() OVERRIDE {
+  virtual void TearDownOnMainThread() OVERRIDE {
     // Clean up UI.
     ChromePasswordManagerClient* client =
         ChromePasswordManagerClient::FromWebContents(GetWebContents());
     client->HidePasswordGenerationPopup();
   }
 
   content::WebContents* GetWebContents() {
     return browser()->tab_strip_model()->GetActiveWebContents();
   }
 
@@ skipping 91 matching lines @@
 IN_PROC_BROWSER_TEST_F(PasswordGenerationInteractiveTest,
                        MAYBE_PopupShownAndDismissedByScrolling) {
   FocusPasswordField();
   EXPECT_TRUE(GenerationPopupShowing());
 
   ASSERT_TRUE(content::ExecuteScript(GetRenderViewHost(),
                                      "window.scrollTo(100, 0);"));
 
   EXPECT_FALSE(GenerationPopupShowing());
 }