Relands "Removed InProcessBrowserTest::CleanUpOnMainThread()"

chrome/browser/chromeos/policy/power_policy_browsertest.cc

Index: chrome/browser/chromeos/policy/power_policy_browsertest.cc
diff --git a/chrome/browser/chromeos/policy/power_policy_browsertest.cc b/chrome/browser/chromeos/policy/power_policy_browsertest.cc
index 4cb2e5750721826dbc41c3ed26de8dedc8536807..4957f45955424d1e596924f15a1a2e48acdfd5b0 100644
--- a/chrome/browser/chromeos/policy/power_policy_browsertest.cc
+++ b/chrome/browser/chromeos/policy/power_policy_browsertest.cc
@@ -157,7 +157,7 @@ class PowerPolicyLoginScreenBrowserTest : public PowerPolicyBrowserTestBase {
   // PowerPolicyBrowserTestBase:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
   virtual void SetUpOnMainThread() OVERRIDE;
-  virtual void CleanUpOnMainThread() OVERRIDE;
+  virtual void TearDownOnMainThread() OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(PowerPolicyLoginScreenBrowserTest);
 };
@@ -291,11 +291,11 @@ void PowerPolicyLoginScreenBrowserTest::SetUpOnMainThread() {
       content::NotificationService::AllSources()).Wait();
 }
 
-void PowerPolicyLoginScreenBrowserTest::CleanUpOnMainThread() {
+void PowerPolicyLoginScreenBrowserTest::TearDownOnMainThread() {
   base::MessageLoop::current()->PostTask(FROM_HERE,
                                          base::Bind(&chrome::AttemptExit));
   base::RunLoop().RunUntilIdle();
-  PowerPolicyBrowserTestBase::CleanUpOnMainThread();
+  PowerPolicyBrowserTestBase::TearDownOnMainThread();
 }
 
 PowerPolicyInSessionBrowserTest::PowerPolicyInSessionBrowserTest() {