Relands "Removed InProcessBrowserTest::CleanUpOnMainThread()"

chrome/browser/chromeos/login/login_manager_test.cc

 // Copyright 2013 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 "chrome/browser/chromeos/login/login_manager_test.h"
 
 #include "base/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
@@ skipping 11 matching lines @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
 
 LoginManagerTest::LoginManagerTest(bool should_launch_browser)
     : should_launch_browser_(should_launch_browser),
       web_contents_(NULL) {
   set_exit_when_last_browser_closes(false);
 }
 
-void LoginManagerTest::CleanUpOnMainThread() {
+void LoginManagerTest::TearDownOnMainThread() {
   if (LoginDisplayHostImpl::default_host())
     LoginDisplayHostImpl::default_host()->Finalize();
   base::MessageLoop::current()->RunUntilIdle();
 }
 
 void LoginManagerTest::SetUpCommandLine(CommandLine* command_line) {
   command_line->AppendSwitch(chromeos::switches::kLoginManager);
   command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests);
 }
 
@@ skipping 75 matching lines @@
     EXPECT_TRUE(host != NULL);
 
     content::WebContents* web_contents =
         host->GetWebUILoginView()->GetWebContents();
     EXPECT_TRUE(web_contents != NULL);
     set_web_contents(web_contents);
     js_checker_.set_web_contents(web_contents);
   }
 
 }  // namespace chromeos