Removed InProcessBrowserTest::CleanUpOnMainThread()

chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc

 // 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.
 
 #include <string>
 
 #include "ash/magnifier/magnifier_constants.h"
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 87 matching lines @@
 
 class LoginScreenDefaultPolicyLoginScreenBrowsertest
     : public LoginScreenDefaultPolicyBrowsertestBase {
  protected:
   LoginScreenDefaultPolicyLoginScreenBrowsertest();
   virtual ~LoginScreenDefaultPolicyLoginScreenBrowsertest();
 
   // LoginScreenDefaultPolicyBrowsertestBase:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
   virtual void SetUpOnMainThread() OVERRIDE;
-  virtual void CleanUpOnMainThread() OVERRIDE;
+  virtual void TearDownOnMainThread() OVERRIDE;
 
   void VerifyPrefFollowsRecommendation(const char* pref_name,
                                        const base::Value& recommended_value);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(LoginScreenDefaultPolicyLoginScreenBrowsertest);
 };
 
 class LoginScreenDefaultPolicyInSessionBrowsertest
     : public LoginScreenDefaultPolicyBrowsertestBase {
@@ skipping 63 matching lines @@
   accessibility_manager->SetProfileForTest(
       chromeos::ProfileHelper::GetSigninProfile());
 
   chromeos::MagnificationManager* magnification_manager =
       chromeos::MagnificationManager::Get();
   ASSERT_TRUE(magnification_manager);
   magnification_manager->SetProfileForTest(
       chromeos::ProfileHelper::GetSigninProfile());
 }
 
-void LoginScreenDefaultPolicyLoginScreenBrowsertest::CleanUpOnMainThread() {
+void LoginScreenDefaultPolicyLoginScreenBrowsertest::TearDownOnMainThread() {
   base::MessageLoop::current()->PostTask(FROM_HERE,
                                          base::Bind(&chrome::AttemptExit));
   base::RunLoop().RunUntilIdle();
-  LoginScreenDefaultPolicyBrowsertestBase::CleanUpOnMainThread();
+  LoginScreenDefaultPolicyBrowsertestBase::TearDownOnMainThread();
 }
 
 void LoginScreenDefaultPolicyLoginScreenBrowsertest::
     VerifyPrefFollowsRecommendation(const char* pref_name,
                                     const base::Value& recommended_value) {
   const PrefService::Preference* pref =
       login_profile_->GetPrefs()->FindPreference(pref_name);
   ASSERT_TRUE(pref);
   EXPECT_FALSE(pref->IsManaged());
   EXPECT_FALSE(pref->IsDefaultValue());
@@ skipping 250 matching lines @@
                                   base::FundamentalValue(true));
 
   // Verify that the on-screen keyboard is enabled.
   chromeos::AccessibilityManager* accessibility_manager =
       chromeos::AccessibilityManager::Get();
   ASSERT_TRUE(accessibility_manager);
   EXPECT_TRUE(accessibility_manager->IsVirtualKeyboardEnabled());
 }
 
 } // namespace policy