Relands "Removed InProcessBrowserTest::CleanUpOnMainThread()"

chrome/browser/chromeos/login/test/oobe_base_test.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 "chrome/browser/chromeos/login/test/oobe_base_test.h"
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 52 matching lines @@
   ExtensionApiTest::SetUpInProcessBrowserTestFixture();
 }
 
 void OobeBaseTest::SetUpOnMainThread() {
   // Restart the thread as the sandbox host process has already been spawned.
   embedded_test_server()->RestartThreadAndListen();
 
   ExtensionApiTest::SetUpOnMainThread();
 }
 
-void OobeBaseTest::CleanUpOnMainThread() {
+void OobeBaseTest::TearDownOnMainThread() {
   // If the login display is still showing, exit gracefully.
   if (LoginDisplayHostImpl::default_host()) {
     base::MessageLoop::current()->PostTask(FROM_HERE,
                                            base::Bind(&chrome::AttemptExit));
     content::RunMessageLoop();
   }
 
-  ExtensionApiTest::CleanUpOnMainThread();
+  ExtensionApiTest::TearDownOnMainThread();
 }
 
 void OobeBaseTest::SetUpCommandLine(CommandLine* command_line) {
   ExtensionApiTest::SetUpCommandLine(command_line);
   command_line->AppendSwitch(chromeos::switches::kLoginManager);
   command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests);
   if (!needs_background_networking_)
     command_line->AppendSwitch(::switches::kDisableBackgroundNetworking);
   command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user");
 
@@ skipping 79 matching lines @@
 
 WebUILoginDisplay* OobeBaseTest::GetLoginDisplay() {
   ExistingUserController* controller =
       ExistingUserController::current_controller();
   CHECK(controller);
   return static_cast<WebUILoginDisplay*>(
       controller->login_display());
 }
 
 }  // namespace chromeos