Removed InProcessBrowserTest::CleanUpOnMainThread()

chrome/browser/chromeos/policy/power_policy_browsertest.cc

 // Copyright (c) 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 <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 139 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(PowerPolicyBrowserTestBase);
 };
 
 class PowerPolicyLoginScreenBrowserTest : public PowerPolicyBrowserTestBase {
  protected:
   PowerPolicyLoginScreenBrowserTest();
 
   // 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);
 };
 
 class PowerPolicyInSessionBrowserTest : public PowerPolicyBrowserTestBase {
  protected:
   PowerPolicyInSessionBrowserTest();
 
   // PowerPolicyBrowserTestBase:
   virtual void SetUpOnMainThread() OVERRIDE;
@@ skipping 113 matching lines @@
 
 void PowerPolicyLoginScreenBrowserTest::SetUpOnMainThread() {
   PowerPolicyBrowserTestBase::SetUpOnMainThread();
 
   // Wait for the login screen to be shown.
   content::WindowedNotificationObserver(
       chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE,
       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() {
 }
 
 void PowerPolicyInSessionBrowserTest::SetUpOnMainThread() {
   PowerPolicyBrowserTestBase::SetUpOnMainThread();
 }
 
 // Verifies that device policy is applied on the login screen.
@@ skipping 196 matching lines @@
   policy = baseline_policy;
   policy.set_ac_idle_action(power_manager_client_->policy().ac_idle_action());
   policy.set_battery_idle_action(
       power_manager_client_->policy().battery_idle_action());
   policy.set_reason(power_manager_client_->policy().reason());
   EXPECT_EQ(GetDebugString(policy),
             GetDebugString(power_manager_client_->policy()));
 }
 
 }  // namespace policy