| 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 e8a21d6a206d1865094a6f76eb5cb28d03e660f0..f83e48b31637a723f43376ea835b3a3b967ecd62 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() {
|
|
|