Relands "Removed InProcessBrowserTest::CleanUpOnMainThread()"

chrome/browser/chromeos/login/login_manager_test.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_LOGIN_MANAGER_TEST_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_LOGIN_MANAGER_TEST_H_
 
 #include <string>
 
 #include "chrome/browser/chromeos/login/mock_login_utils.h"
@@ skipping 12 matching lines @@
 // If no special configuration is done launches out-of-box WebUI.
 // To launch login UI use PRE_* test that will register user(s) and mark
 // out-of-box as completed.
 // Guarantees that WebUI has been initialized by waiting for
 // NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE notification.
 class LoginManagerTest : public InProcessBrowserTest {
  public:
   explicit LoginManagerTest(bool should_launch_browser);
 
   // Overriden from InProcessBrowserTest.
-  virtual void CleanUpOnMainThread() OVERRIDE;
+  virtual void TearDownOnMainThread() OVERRIDE;
   virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE;
   virtual void SetUpOnMainThread() OVERRIDE;
 
   // Registers the user with the given |user_id| on the device.
   // This method should be called in PRE_* test.
   // TODO(dzhioev): Add the ability to register users without a PRE_* test.
   void RegisterUser(const std::string& user_id);
 
   // Set expected credentials for next login attempt.
@@ skipping 34 matching lines @@
   bool should_launch_browser_;
   content::WebContents* web_contents_;
   test::JSChecker js_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(LoginManagerTest);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_LOGIN_MANAGER_TEST_H_