diff options
91 files changed, 121 insertions, 150 deletions
diff --git a/chrome/browser/apps/app_browsertest.cc b/chrome/browser/apps/app_browsertest.cc index c349fa0..a5a7582 100644 --- a/chrome/browser/apps/app_browsertest.cc +++ b/chrome/browser/apps/app_browsertest.cc @@ -1213,9 +1213,9 @@ class RestartDeviceTest : public PlatformAppBrowserTest { .WillRepeatedly(testing::Return(true)); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { user_manager_enabler_.reset(); - PlatformAppBrowserTest::CleanUpOnMainThread(); + PlatformAppBrowserTest::TearDownOnMainThread(); } virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { diff --git a/chrome/browser/apps/drive/drive_app_provider_browsertest.cc b/chrome/browser/apps/drive/drive_app_provider_browsertest.cc index 4165a19..e6403a9 100644 --- a/chrome/browser/apps/drive/drive_app_provider_browsertest.cc +++ b/chrome/browser/apps/drive/drive_app_provider_browsertest.cc @@ -77,12 +77,12 @@ class DriveAppProviderTest : public ExtensionBrowserTest, .PassAs<DriveServiceBridge>()); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { provider_.reset(); apps_registry_.reset(); fake_drive_service_.reset(); - ExtensionBrowserTest::CleanUpOnMainThread(); + ExtensionBrowserTest::TearDownOnMainThread(); } const Extension* InstallChromeApp(int expected_change) { diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc index 0249d06..f5bb63b 100644 --- a/chrome/browser/autofill/autofill_browsertest.cc +++ b/chrome/browser/autofill/autofill_browsertest.cc @@ -120,7 +120,7 @@ class AutofillTest : public InProcessBrowserTest { test::DisableSystemServices(browser()->profile()->GetPrefs()); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { // Make sure to close any showing popups prior to tearing down the UI. content::WebContents* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); diff --git a/chrome/browser/autofill/autofill_interactive_uitest.cc b/chrome/browser/autofill/autofill_interactive_uitest.cc index 11e562c..b0fb1ce 100644 --- a/chrome/browser/autofill/autofill_interactive_uitest.cc +++ b/chrome/browser/autofill/autofill_interactive_uitest.cc @@ -213,7 +213,7 @@ class AutofillInteractiveTest : public InProcessBrowserTest { autofill_manager->SetTestDelegate(&test_delegate_); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { // Make sure to close any showing popups prior to tearing down the UI. content::WebContents* web_contents = GetWebContents(); AutofillManager* autofill_manager = ContentAutofillDriver::FromWebContents( diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc index 67a9e3e..11deb82 100644 --- a/chrome/browser/captive_portal/captive_portal_browsertest.cc +++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc @@ -790,7 +790,7 @@ class CaptivePortalBrowserTest : public InProcessBrowserTest { // InProcessBrowserTest: virtual void SetUpOnMainThread() OVERRIDE; - virtual void CleanUpOnMainThread() OVERRIDE; + virtual void TearDownOnMainThread() OVERRIDE; // Sets the captive portal checking preference. Does not affect the command // line flag, which is set in SetUpCommandLine. @@ -968,7 +968,7 @@ void CaptivePortalBrowserTest::SetUpOnMainThread() { GURL(kMockCaptivePortalTestUrl)); } -void CaptivePortalBrowserTest::CleanUpOnMainThread() { +void CaptivePortalBrowserTest::TearDownOnMainThread() { // No test should have a captive portal check pending on quit. EXPECT_FALSE(CheckPending(browser())); } diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc b/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc index ce8ee60..0c4c473 100644 --- a/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc +++ b/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc @@ -242,7 +242,7 @@ class AccessibilityManagerTest : public InProcessBrowserTest { default_autoclick_delay_ = GetAutoclickDelay(); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { AccessibilityManager::SetBrailleControllerForTest(NULL); } diff --git a/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc b/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc index a359a23..44c1884 100644 --- a/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc +++ b/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc @@ -50,7 +50,7 @@ class LoggedInSpokenFeedbackTest : public InProcessBrowserTest { AccessibilityManager::SetBrailleControllerForTest(&braille_controller_); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { AccessibilityManager::SetBrailleControllerForTest(NULL); } diff --git a/chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc b/chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc index 1a2a809..0e78b04 100644 --- a/chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc +++ b/chrome/browser/chromeos/accessibility/touch_exploration_controller_browsertest.cc @@ -50,7 +50,7 @@ class TouchExplorationTest : public InProcessBrowserTest { root_window_->AddPreTargetHandler(event_handler_.get()); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { SwitchTouchExplorationMode(false); root_window_->RemovePreTargetHandler(event_handler_.get()); } diff --git a/chrome/browser/chromeos/customization_wallpaper_downloader_browsertest.cc b/chrome/browser/chromeos/customization_wallpaper_downloader_browsertest.cc index a81eb06..f900896 100644 --- a/chrome/browser/chromeos/customization_wallpaper_downloader_browsertest.cc +++ b/chrome/browser/chromeos/customization_wallpaper_downloader_browsertest.cc @@ -236,7 +236,7 @@ class CustomizationWallpaperDownloaderBrowserTest command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user"); } - virtual void CleanUpOnMainThread() OVERRIDE { controller_ = NULL; } + virtual void TearDownOnMainThread() OVERRIDE { controller_ = NULL; } protected: void CreateCmdlineWallpapers() { diff --git a/chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc b/chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc index da4f118..cbb3f5f 100644 --- a/chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc +++ b/chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc @@ -53,7 +53,7 @@ class DriveFirstRunTest : public InProcessBrowserTest, // InProcessBrowserTest overrides: virtual void SetUpOnMainThread() OVERRIDE; - virtual void CleanUpOnMainThread() OVERRIDE; + virtual void TearDownOnMainThread() OVERRIDE; // DriveFirstRunController::Observer overrides: virtual void OnCompletion(bool success) OVERRIDE; @@ -102,8 +102,7 @@ void DriveFirstRunTest::SetUpOnMainThread() { controller_->SetAppInfoForTest(kTestAppId, kTestEndpointUrl); } -void DriveFirstRunTest::CleanUpOnMainThread() { - InProcessBrowserTest::CleanUpOnMainThread(); +void DriveFirstRunTest::TearDownOnMainThread() { content::RunAllPendingInMessageLoop(); } diff --git a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc index 5cdae17..61bab50 100644 --- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc +++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc @@ -176,14 +176,14 @@ class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest { testing_profile_.get()); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { // ExistingUserController must be deleted before the thread is cleaned up: // If there is an outstanding login attempt when ExistingUserController is // deleted, its LoginPerformer instance will be deleted, which in turn // deletes its OnlineAttemptHost instance. However, OnlineAttemptHost must // be deleted on the UI thread. existing_user_controller_.reset(); - DevicePolicyCrosBrowserTest::InProcessBrowserTest::CleanUpOnMainThread(); + DevicePolicyCrosBrowserTest::InProcessBrowserTest::TearDownOnMainThread(); testing_profile_.reset(NULL); user_manager_enabler_.reset(); } diff --git a/chrome/browser/chromeos/login/kiosk_browsertest.cc b/chrome/browser/chromeos/login/kiosk_browsertest.cc index 4bf1f4a..a382507 100644 --- a/chrome/browser/chromeos/login/kiosk_browsertest.cc +++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc @@ -253,11 +253,11 @@ class KioskTest : public OobeBaseTest { OobeBaseTest::TearDown(); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { AppLaunchController::SetNetworkTimeoutCallbackForTesting(NULL); AppLaunchSigninScreen::SetUserManagerForTesting(NULL); - OobeBaseTest::CleanUpOnMainThread(); + OobeBaseTest::TearDownOnMainThread(); // Clean up while main thread still runs. // See http://crbug.com/176659. diff --git a/chrome/browser/chromeos/login/login_manager_test.cc b/chrome/browser/chromeos/login/login_manager_test.cc index 95c9416..6d5445a 100644 --- a/chrome/browser/chromeos/login/login_manager_test.cc +++ b/chrome/browser/chromeos/login/login_manager_test.cc @@ -29,7 +29,7 @@ LoginManagerTest::LoginManagerTest(bool should_launch_browser) set_exit_when_last_browser_closes(false); } -void LoginManagerTest::CleanUpOnMainThread() { +void LoginManagerTest::TearDownOnMainThread() { if (LoginDisplayHostImpl::default_host()) LoginDisplayHostImpl::default_host()->Finalize(); base::MessageLoop::current()->RunUntilIdle(); diff --git a/chrome/browser/chromeos/login/login_manager_test.h b/chrome/browser/chromeos/login/login_manager_test.h index bed5c99..992c91a 100644 --- a/chrome/browser/chromeos/login/login_manager_test.h +++ b/chrome/browser/chromeos/login/login_manager_test.h @@ -30,7 +30,7 @@ class LoginManagerTest : public InProcessBrowserTest { 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; diff --git a/chrome/browser/chromeos/login/oobe_browsertest.cc b/chrome/browser/chromeos/login/oobe_browsertest.cc index b4bc817..53b218a 100644 --- a/chrome/browser/chromeos/login/oobe_browsertest.cc +++ b/chrome/browser/chromeos/login/oobe_browsertest.cc @@ -51,7 +51,7 @@ class OobeTest : public InProcessBrowserTest { ::switches::kGaiaUrl, embedded_test_server()->base_url().spec()); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { // If the login display is still showing, exit gracefully. if (LoginDisplayHostImpl::default_host()) { base::MessageLoop::current()->PostTask(FROM_HERE, diff --git a/chrome/browser/chromeos/login/saml/saml_browsertest.cc b/chrome/browser/chromeos/login/saml/saml_browsertest.cc index a45fba4..223184f 100644 --- a/chrome/browser/chromeos/login/saml/saml_browsertest.cc +++ b/chrome/browser/chromeos/login/saml/saml_browsertest.cc @@ -271,7 +271,7 @@ class SamlTest : public InProcessBrowserTest { content::NotificationService::AllSources())); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { // If the login display is still showing, exit gracefully. if (LoginDisplayHostImpl::default_host()) { base::MessageLoop::current()->PostTask(FROM_HERE, diff --git a/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc b/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc index 817b703..c0fb323 100644 --- a/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc +++ b/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc @@ -91,10 +91,10 @@ class UpdateScreenTest : public WizardInProcessBrowserTest { update_screen_->screen_observer_ = mock_screen_observer_.get(); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { mock_error_screen_.reset(); mock_error_screen_actor_.reset(); - WizardInProcessBrowserTest::CleanUpOnMainThread(); + WizardInProcessBrowserTest::TearDownOnMainThread(); } virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_test_base.cc b/chrome/browser/chromeos/login/supervised/supervised_user_test_base.cc index 1b6645f..02745e5 100644 --- a/chrome/browser/chromeos/login/supervised/supervised_user_test_base.cc +++ b/chrome/browser/chromeos/login/supervised/supervised_user_test_base.cc @@ -203,10 +203,6 @@ void SupervisedUserTestBase::SetUpInProcessBrowserTestFixture() { online_state); } -void SupervisedUserTestBase::CleanUpOnMainThread() { - LoginManagerTest::CleanUpOnMainThread(); -} - void SupervisedUserTestBase::TearDown() { cryptohome::AsyncMethodCaller::Shutdown(); cryptohome::HomedirMethods::Shutdown(); diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_test_base.h b/chrome/browser/chromeos/login/supervised/supervised_user_test_base.h index ff5d5ff..78df688 100644 --- a/chrome/browser/chromeos/login/supervised/supervised_user_test_base.h +++ b/chrome/browser/chromeos/login/supervised/supervised_user_test_base.h @@ -70,7 +70,6 @@ class SupervisedUserTestBase : public chromeos::LoginManagerTest { virtual ~SupervisedUserTestBase(); virtual void SetUpInProcessBrowserTestFixture() OVERRIDE; - virtual void CleanUpOnMainThread() OVERRIDE; protected: virtual void TearDown() OVERRIDE; diff --git a/chrome/browser/chromeos/login/test/oobe_base_test.cc b/chrome/browser/chromeos/login/test/oobe_base_test.cc index af8d5b4..f9c0d34 100644 --- a/chrome/browser/chromeos/login/test/oobe_base_test.cc +++ b/chrome/browser/chromeos/login/test/oobe_base_test.cc @@ -70,7 +70,7 @@ void OobeBaseTest::SetUpOnMainThread() { ExtensionApiTest::SetUpOnMainThread(); } -void OobeBaseTest::CleanUpOnMainThread() { +void OobeBaseTest::TearDownOnMainThread() { // If the login display is still showing, exit gracefully. if (LoginDisplayHostImpl::default_host()) { base::MessageLoop::current()->PostTask(FROM_HERE, @@ -78,7 +78,7 @@ void OobeBaseTest::CleanUpOnMainThread() { content::RunMessageLoop(); } - ExtensionApiTest::CleanUpOnMainThread(); + ExtensionApiTest::TearDownOnMainThread(); } void OobeBaseTest::SetUpCommandLine(CommandLine* command_line) { diff --git a/chrome/browser/chromeos/login/test/oobe_base_test.h b/chrome/browser/chromeos/login/test/oobe_base_test.h index 6a42891..eb37bcc 100644 --- a/chrome/browser/chromeos/login/test/oobe_base_test.h +++ b/chrome/browser/chromeos/login/test/oobe_base_test.h @@ -38,7 +38,7 @@ class OobeBaseTest : public ExtensionApiTest { virtual void SetUp() OVERRIDE; virtual void SetUpInProcessBrowserTestFixture() OVERRIDE; virtual void SetUpOnMainThread() OVERRIDE; - virtual void CleanUpOnMainThread() OVERRIDE; + virtual void TearDownOnMainThread() OVERRIDE; virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE; // Network status control functions. diff --git a/chrome/browser/chromeos/login/test/wizard_in_process_browser_test.cc b/chrome/browser/chromeos/login/test/wizard_in_process_browser_test.cc index a1e4ae9..be9ce5a 100644 --- a/chrome/browser/chromeos/login/test/wizard_in_process_browser_test.cc +++ b/chrome/browser/chromeos/login/test/wizard_in_process_browser_test.cc @@ -41,7 +41,7 @@ void WizardInProcessBrowserTest::SetUpOnMainThread() { } } -void WizardInProcessBrowserTest::CleanUpOnMainThread() { +void WizardInProcessBrowserTest::TearDownOnMainThread() { // LoginDisplayHost owns controllers and all windows. base::MessageLoopForUI::current()->DeleteSoon(FROM_HERE, host_); diff --git a/chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h b/chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h index cb6c1c3..656f731 100644 --- a/chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h +++ b/chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h @@ -37,7 +37,7 @@ class WizardInProcessBrowserTest : public InProcessBrowserTest { // Overriden from InProcessBrowserTest: virtual void SetUpOnMainThread() OVERRIDE; virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE; - virtual void CleanUpOnMainThread() OVERRIDE; + virtual void TearDownOnMainThread() OVERRIDE; private: std::string screen_name_; diff --git a/chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc b/chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc index ae51062..ef6b6ba 100644 --- a/chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc +++ b/chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc @@ -89,7 +89,7 @@ class CaptivePortalWindowTest : public InProcessBrowserTest { new CaptivePortalWindowProxy(&delegate_, web_contents)); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { captive_portal_window_proxy_.reset(); base::MessageLoopForUI::current()->DeleteSoon(FROM_HERE, host_); base::MessageLoopForUI::current()->RunUntilIdle(); diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc index 72b66e1..2b11522 100644 --- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc +++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc @@ -77,7 +77,7 @@ class WallpaperManagerBrowserTest : public InProcessBrowserTest { command_line->AppendSwitchASCII(switches::kLoginProfile, "user"); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { controller_ = NULL; } diff --git a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc index d15506c..1861cb9 100644 --- a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc +++ b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc @@ -343,7 +343,7 @@ class DeviceLocalAccountTest : public DevicePolicyCrosBrowserTest, InitializePolicy(); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { BrowserList::RemoveObserver(this); // This shuts down the login UI. diff --git a/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc b/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc index cf7b4ca..3142f4e 100644 --- a/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc +++ b/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc @@ -105,7 +105,7 @@ class 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); @@ -189,11 +189,11 @@ void LoginScreenDefaultPolicyLoginScreenBrowsertest::SetUpOnMainThread() { 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:: diff --git a/chrome/browser/chromeos/policy/power_policy_browsertest.cc b/chrome/browser/chromeos/policy/power_policy_browsertest.cc index 4cb2e57..4957f45 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() { diff --git a/chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc b/chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc index 1cf7fc1..27c7218 100644 --- a/chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc +++ b/chrome/browser/chromeos/power/peripheral_battery_observer_browsertest.cc @@ -46,7 +46,7 @@ class PeripheralBatteryObserverTest : public InProcessBrowserTest { observer_.reset(new PeripheralBatteryObserver()); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { observer_.reset(); } diff --git a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc index f02205b..7659f49 100644 --- a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc +++ b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc @@ -91,7 +91,7 @@ class TrayAccessibilityTest InProcessBrowserTest::RunTestOnMainThreadLoop(); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { AccessibilityManager::SetBrailleControllerForTest(NULL); } diff --git a/chrome/browser/devtools/device/usb/android_usb_browsertest.cc b/chrome/browser/devtools/device/usb/android_usb_browsertest.cc index b1e2d13..6baed7e 100644 --- a/chrome/browser/devtools/device/usb/android_usb_browsertest.cc +++ b/chrome/browser/devtools/device/usb/android_usb_browsertest.cc @@ -597,7 +597,7 @@ class AndroidUsbDiscoveryTest : public InProcessBrowserTest { UsbService::SetInstanceForTest(new MockUsbService()); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { scoped_refptr<content::MessageLoopRunner> runner = new content::MessageLoopRunner; UsbService* service = NULL; diff --git a/chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc b/chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc index 4640bc9..91c3f95 100644 --- a/chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc +++ b/chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc @@ -87,7 +87,7 @@ class DomDistillerViewerSourceBrowserTest : public InProcessBrowserTest { database_model_ = new FakeDB<ArticleEntry>::EntryMap; } - virtual void CleanUpOnMainThread() OVERRIDE { delete database_model_; } + virtual void TearDownOnMainThread() OVERRIDE { delete database_model_; } virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { command_line->AppendSwitch(switches::kEnableDomDistiller); diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc index 7a225d9..2fa4b55 100644 --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc @@ -453,7 +453,7 @@ class DownloadTest : public InProcessBrowserTest { ASSERT_TRUE(InitialSetup()); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { // Needs to be torn down on the main thread. file_activity_observer_ holds a // reference to the ChromeDownloadManagerDelegate which should be destroyed // on the UI thread. diff --git a/chrome/browser/errorpage_browsertest.cc b/chrome/browser/errorpage_browsertest.cc index 724e2a1..1d676a9 100644 --- a/chrome/browser/errorpage_browsertest.cc +++ b/chrome/browser/errorpage_browsertest.cc @@ -965,7 +965,7 @@ class ErrorPageNavigationCorrectionsFailTest : public ErrorPageTest { base::Bind(&ErrorPageNavigationCorrectionsFailTest::AddFilters)); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, base::Bind(&ErrorPageNavigationCorrectionsFailTest::RemoveFilters)); @@ -1068,7 +1068,7 @@ class ErrorPageForIDNTest : public InProcessBrowserTest { base::Bind(&ErrorPageForIDNTest::AddFilters)); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, base::Bind(&ErrorPageForIDNTest::RemoveFilters)); diff --git a/chrome/browser/extensions/active_script_controller_browsertest.cc b/chrome/browser/extensions/active_script_controller_browsertest.cc index aa7bab3..1bb934c 100644 --- a/chrome/browser/extensions/active_script_controller_browsertest.cc +++ b/chrome/browser/extensions/active_script_controller_browsertest.cc @@ -73,7 +73,7 @@ class ActiveScriptControllerBrowserTest : public ExtensionBrowserTest { ActiveScriptControllerBrowserTest() {} virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE; - virtual void CleanUpOnMainThread() OVERRIDE; + virtual void TearDownOnMainThread() OVERRIDE; // Returns an extension with the given |host_type| and |injection_type|. If // one already exists, the existing extension will be returned. Othewrwise, @@ -96,7 +96,7 @@ void ActiveScriptControllerBrowserTest::SetUpCommandLine( command_line->AppendSwitch(switches::kEnableScriptsRequireAction); } -void ActiveScriptControllerBrowserTest::CleanUpOnMainThread() { +void ActiveScriptControllerBrowserTest::TearDownOnMainThread() { test_extension_dirs_.clear(); } diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_apitest.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_apitest.cc index 5018817..c2016a6 100644 --- a/chrome/browser/extensions/api/bluetooth/bluetooth_apitest.cc +++ b/chrome/browser/extensions/api/bluetooth/bluetooth_apitest.cc @@ -48,7 +48,7 @@ class BluetoothApiTest : public ExtensionApiTest { SetUpMockAdapter(); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { EXPECT_CALL(*mock_adapter_, RemoveObserver(testing::_)); } diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_private_apitest.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_private_apitest.cc index 6e0bc32..3589aaf 100644 --- a/chrome/browser/extensions/api/bluetooth/bluetooth_private_apitest.cc +++ b/chrome/browser/extensions/api/bluetooth/bluetooth_private_apitest.cc @@ -61,7 +61,7 @@ class BluetoothPrivateApiTest : public ExtensionApiTest { .WillByDefault(Return(true)); } - virtual void CleanUpOnMainThread() OVERRIDE {} + virtual void TearDownOnMainThread() OVERRIDE {} extensions::BluetoothEventRouter* event_router() { return extensions::BluetoothAPI::Get(browser()->profile()) diff --git a/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc b/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc index 07820c2d..829009e 100644 --- a/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc +++ b/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc @@ -101,7 +101,7 @@ class BluetoothLowEnergyApiTest : public ExtensionApiTest { SetUpMocks(); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { EXPECT_CALL(*mock_adapter_, RemoveObserver(_)); } diff --git a/chrome/browser/extensions/api/bluetooth_socket/bluetooth_socket_apitest.cc b/chrome/browser/extensions/api/bluetooth_socket/bluetooth_socket_apitest.cc index 1a829ad..186fb38 100644 --- a/chrome/browser/extensions/api/bluetooth_socket/bluetooth_socket_apitest.cc +++ b/chrome/browser/extensions/api/bluetooth_socket/bluetooth_socket_apitest.cc @@ -45,10 +45,6 @@ class BluetoothSocketApiTest : public ExtensionApiTest { SetUpMockAdapter(); } - virtual void CleanUpOnMainThread() OVERRIDE { - ExtensionApiTest::CleanUpOnMainThread(); - } - void SetUpMockAdapter() { // The browser will clean this up when it is torn down. mock_adapter_ = new testing::StrictMock<MockBluetoothAdapter>(); diff --git a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc index a7fae5e..acafd99 100644 --- a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc +++ b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc @@ -53,14 +53,14 @@ class ExtensionContentSettingsApiTest : public ExtensionApiTest { g_browser_process->AddRefModule(); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { // ReleaseBrowserProcessModule() needs to be called in a message loop, so we // post a task to do it, then run the message loop. base::MessageLoop::current()->PostTask( FROM_HERE, base::Bind(&ReleaseBrowserProcessModule)); content::RunAllPendingInMessageLoop(); - ExtensionApiTest::CleanUpOnMainThread(); + ExtensionApiTest::TearDownOnMainThread(); } protected: diff --git a/chrome/browser/extensions/api/dns/dns_apitest.cc b/chrome/browser/extensions/api/dns/dns_apitest.cc index 52448ca..8bb70ac 100644 --- a/chrome/browser/extensions/api/dns/dns_apitest.cc +++ b/chrome/browser/extensions/api/dns/dns_apitest.cc @@ -19,11 +19,11 @@ class DnsApiTest : public ExtensionApiTest { resolver_creator_->CreateMockHostResolver()); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { extensions::HostResolverWrapper::GetInstance()-> SetHostResolverForTesting(NULL); resolver_creator_->DeleteMockHostResolver(); - ExtensionApiTest::CleanUpOnMainThread(); + ExtensionApiTest::TearDownOnMainThread(); } // The MockHostResolver asserts that it's used on the same thread on which diff --git a/chrome/browser/extensions/api/preference/preference_apitest.cc b/chrome/browser/extensions/api/preference/preference_apitest.cc index 618e8da..71b8afd 100644 --- a/chrome/browser/extensions/api/preference/preference_apitest.cc +++ b/chrome/browser/extensions/api/preference/preference_apitest.cc @@ -81,14 +81,14 @@ class ExtensionPreferenceApiTest : public ExtensionApiTest { g_browser_process->AddRefModule(); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { // ReleaseBrowserProcessModule() needs to be called in a message loop, so we // post a task to do it, then run the message loop. base::MessageLoop::current()->PostTask( FROM_HERE, base::Bind(&ReleaseBrowserProcessModule)); content::RunAllPendingInMessageLoop(); - ExtensionApiTest::CleanUpOnMainThread(); + ExtensionApiTest::TearDownOnMainThread(); } Profile* profile_; diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc index 6aee292..c8f7b40 100644 --- a/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc +++ b/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc @@ -73,7 +73,7 @@ class PushMessagingCanaryTest : public ExtensionApiTest { // InProcessBrowserTest override. Destroys the sync client and sync // profile created by the test. We must clean up ProfileSyncServiceHarness // now before the profile is cleaned up. - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { sync_setup_helper_.reset(); } diff --git a/chrome/browser/extensions/api/socket/socket_apitest.cc b/chrome/browser/extensions/api/socket/socket_apitest.cc index 718eea0..bae9983 100644 --- a/chrome/browser/extensions/api/socket/socket_apitest.cc +++ b/chrome/browser/extensions/api/socket/socket_apitest.cc @@ -39,7 +39,7 @@ class SocketApiTest : public ExtensionApiTest { resolver_creator_->CreateMockHostResolver()); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { extensions::HostResolverWrapper::GetInstance()-> SetHostResolverForTesting(NULL); resolver_creator_->DeleteMockHostResolver(); diff --git a/chrome/browser/extensions/api/sockets_tcp/sockets_tcp_apitest.cc b/chrome/browser/extensions/api/sockets_tcp/sockets_tcp_apitest.cc index 8159fe3..f49a180 100644 --- a/chrome/browser/extensions/api/sockets_tcp/sockets_tcp_apitest.cc +++ b/chrome/browser/extensions/api/sockets_tcp/sockets_tcp_apitest.cc @@ -47,7 +47,7 @@ class SocketsTcpApiTest : public ExtensionApiTest { resolver_creator_->CreateMockHostResolver()); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { extensions::HostResolverWrapper::GetInstance()-> SetHostResolverForTesting(NULL); resolver_creator_->DeleteMockHostResolver(); diff --git a/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_apitest.cc b/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_apitest.cc index 8b9a7ab..8043b7b 100644 --- a/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_apitest.cc +++ b/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_apitest.cc @@ -49,7 +49,7 @@ class SocketsTcpServerApiTest : public ExtensionApiTest { resolver_creator_->CreateMockHostResolver()); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { extensions::HostResolverWrapper::GetInstance()-> SetHostResolverForTesting(NULL); resolver_creator_->DeleteMockHostResolver(); diff --git a/chrome/browser/extensions/api/sockets_udp/sockets_udp_apitest.cc b/chrome/browser/extensions/api/sockets_udp/sockets_udp_apitest.cc index 2e80122..de49b6b 100644 --- a/chrome/browser/extensions/api/sockets_udp/sockets_udp_apitest.cc +++ b/chrome/browser/extensions/api/sockets_udp/sockets_udp_apitest.cc @@ -49,7 +49,7 @@ class SocketsUdpApiTest : public ExtensionApiTest { resolver_creator_->CreateMockHostResolver()); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { extensions::HostResolverWrapper::GetInstance()-> SetHostResolverForTesting(NULL); resolver_creator_->DeleteMockHostResolver(); diff --git a/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc b/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc index 3092ee0..00b5b4e 100644 --- a/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc +++ b/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc @@ -141,11 +141,11 @@ class StreamsPrivateApiTest : public ExtensionApiTest { ExtensionApiTest::SetUpOnMainThread(); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { // Tear down the test server. EXPECT_TRUE(test_server_->ShutdownAndWaitUntilComplete()); test_server_.reset(); - ExtensionApiTest::CleanUpOnMainThread(); + ExtensionApiTest::TearDownOnMainThread(); } void InitializeDownloadSettings() { diff --git a/chrome/browser/extensions/api/system_display/system_display_apitest.cc b/chrome/browser/extensions/api/system_display/system_display_apitest.cc index 17a0dcf..e2b78f7 100644 --- a/chrome/browser/extensions/api/system_display/system_display_apitest.cc +++ b/chrome/browser/extensions/api/system_display/system_display_apitest.cc @@ -182,12 +182,12 @@ class SystemDisplayApiTest: public ExtensionApiTest { DisplayInfoProvider::InitializeForTesting(provider_.get()); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { #if defined(OS_CHROMEOS) gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, ash::Shell::GetScreen()); #endif - ExtensionApiTest::CleanUpOnMainThread(); + ExtensionApiTest::TearDownOnMainThread(); } protected: diff --git a/chrome/browser/extensions/extension_test_message_listener.h b/chrome/browser/extensions/extension_test_message_listener.h index 557ce6c..d0d5bbb 100644 --- a/chrome/browser/extensions/extension_test_message_listener.h +++ b/chrome/browser/extensions/extension_test_message_listener.h @@ -82,7 +82,7 @@ class TestSendMessageFunction; // destructed *before* the browser gets torn down. Two common patterns are to // either make it a local variable inside your test body, or if it's a member // variable of a ExtensionBrowserTest subclass, override the -// InProcessBrowserTest::CleanUpOnMainThread() method and clean it up there. +// BrowserTestBase::TearDownOnMainThread() method and clean it up there. class ExtensionTestMessageListener : public content::NotificationObserver { public: // We immediately start listening for |expected_message|. diff --git a/chrome/browser/extensions/extension_toolbar_model_browsertest.cc b/chrome/browser/extensions/extension_toolbar_model_browsertest.cc index f01b30e..a34b89e 100644 --- a/chrome/browser/extensions/extension_toolbar_model_browsertest.cc +++ b/chrome/browser/extensions/extension_toolbar_model_browsertest.cc @@ -32,7 +32,7 @@ class ExtensionToolbarModelTest : public ExtensionBrowserTest, model_->AddObserver(this); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { model_->RemoveObserver(this); } diff --git a/chrome/browser/net/dns_probe_browsertest.cc b/chrome/browser/net/dns_probe_browsertest.cc index d254d4e..5658745 100644 --- a/chrome/browser/net/dns_probe_browsertest.cc +++ b/chrome/browser/net/dns_probe_browsertest.cc @@ -429,7 +429,7 @@ class DnsProbeBrowserTest : public InProcessBrowserTest { virtual ~DnsProbeBrowserTest(); virtual void SetUpOnMainThread() OVERRIDE; - virtual void CleanUpOnMainThread() OVERRIDE; + virtual void TearDownOnMainThread() OVERRIDE; protected: // Sets the browser object that other methods apply to, and that has the @@ -509,7 +509,7 @@ void DnsProbeBrowserTest::SetUpOnMainThread() { SetActiveBrowser(browser()); } -void DnsProbeBrowserTest::CleanUpOnMainThread() { +void DnsProbeBrowserTest::TearDownOnMainThread() { BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, Bind(&DnsProbeBrowserTestIOThreadHelper::CleanUpOnIOThreadAndDeleteHelper, diff --git a/chrome/browser/notifications/login_state_notification_blocker_chromeos_browsertest.cc b/chrome/browser/notifications/login_state_notification_blocker_chromeos_browsertest.cc index 451fc7a..2f83bc1 100644 --- a/chrome/browser/notifications/login_state_notification_blocker_chromeos_browsertest.cc +++ b/chrome/browser/notifications/login_state_notification_blocker_chromeos_browsertest.cc @@ -35,11 +35,11 @@ class LoginStateNotificationBlockerChromeOSBrowserTest chromeos::LoginManagerTest::SetUpOnMainThread(); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { if (blocker_) blocker_->RemoveObserver(this); blocker_.reset(); - chromeos::LoginManagerTest::CleanUpOnMainThread(); + chromeos::LoginManagerTest::TearDownOnMainThread(); } protected: diff --git a/chrome/browser/password_manager/password_generation_interactive_uitest.cc b/chrome/browser/password_manager/password_generation_interactive_uitest.cc index d06fe19..183b5f9 100644 --- a/chrome/browser/password_manager/password_generation_interactive_uitest.cc +++ b/chrome/browser/password_manager/password_generation_interactive_uitest.cc @@ -74,7 +74,7 @@ class PasswordGenerationInteractiveTest : public InProcessBrowserTest { ui_test_utils::NavigateToURL(browser(), url); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { // Clean up UI. ChromePasswordManagerClient* client = ChromePasswordManagerClient::FromWebContents(GetWebContents()); diff --git a/chrome/browser/password_manager/password_manager_browsertest.cc b/chrome/browser/password_manager/password_manager_browsertest.cc index 92a3e9f..ff2fdce 100644 --- a/chrome/browser/password_manager/password_manager_browsertest.cc +++ b/chrome/browser/password_manager/password_manager_browsertest.cc @@ -263,9 +263,8 @@ class PasswordManagerBrowserTest : public InProcessBrowserTest { password_manager::switches::kEnableAutomaticPasswordSaving)); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { ASSERT_TRUE(embedded_test_server()->ShutdownAndWaitUntilComplete()); - InProcessBrowserTest::CleanUpOnMainThread(); } protected: diff --git a/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc b/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc index 518d376..80ed8ee 100644 --- a/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc +++ b/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc @@ -85,7 +85,7 @@ class CloudPolicyManagerTest : public InProcessBrowserTest { #endif } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { // Verify that all the expected requests were handled. EXPECT_EQ(0u, interceptor_->GetPendingSize()); diff --git a/chrome/browser/policy/cloud/device_management_service_browsertest.cc b/chrome/browser/policy/cloud/device_management_service_browsertest.cc index 6ec8b7d..1cf7a58 100644 --- a/chrome/browser/policy/cloud/device_management_service_browsertest.cc +++ b/chrome/browser/policy/cloud/device_management_service_browsertest.cc @@ -149,7 +149,7 @@ class DeviceManagementServiceIntegrationTest service_->ScheduleInitialization(0); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { service_.reset(); test_server_.reset(); interceptor_.reset(); diff --git a/chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc b/chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc index 222429b..ecbc392 100644 --- a/chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc +++ b/chrome/browser/prefs/synced_pref_change_registrar_browsertest.cc @@ -114,7 +114,7 @@ class SyncedPrefChangeRegistrarTest : public InProcessBrowserTest { registrar_.reset(new SyncedPrefChangeRegistrar(prefs_)); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { registrar_.reset(); } diff --git a/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc b/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc index 0ef7e3d..232ee1a 100644 --- a/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc +++ b/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc @@ -139,7 +139,7 @@ class PrintPreviewDialogControllerBrowserTest : public InProcessBrowserTest { ASSERT_NE(first_tab, initiator_); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { cloned_tab_observer_.reset(); initiator_ = NULL; } diff --git a/chrome/browser/renderer_context_menu/spelling_menu_observer_browsertest.cc b/chrome/browser/renderer_context_menu/spelling_menu_observer_browsertest.cc index 6c8ad8b..3d281ce 100644 --- a/chrome/browser/renderer_context_menu/spelling_menu_observer_browsertest.cc +++ b/chrome/browser/renderer_context_menu/spelling_menu_observer_browsertest.cc @@ -208,7 +208,7 @@ class SpellingMenuObserverTest : public InProcessBrowserTest { Reset(false); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { observer_.reset(); menu_.reset(); } diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate_browsertest.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate_browsertest.cc index 285bc53..6784b6a 100644 --- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate_browsertest.cc +++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate_browsertest.cc @@ -134,10 +134,9 @@ class ChromeResourceDispatcherHostDelegateBrowserTest : } } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { content::ResourceDispatcherHost::Get()->SetDelegate(NULL); dispatcher_host_delegate_.reset(); - InProcessBrowserTest::CleanUpOnMainThread(); } protected: diff --git a/chrome/browser/resources/pdf/pdf_extension_test.cc b/chrome/browser/resources/pdf/pdf_extension_test.cc index 41a738a..b25a9f2 100644 --- a/chrome/browser/resources/pdf/pdf_extension_test.cc +++ b/chrome/browser/resources/pdf/pdf_extension_test.cc @@ -31,9 +31,9 @@ class PDFExtensionTest : public ExtensionApiTest { } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { ASSERT_TRUE(embedded_test_server()->ShutdownAndWaitUntilComplete()); - ExtensionApiTest::CleanUpOnMainThread(); + ExtensionApiTest::TearDownOnMainThread(); } void RunTestsInFile(std::string filename, bool requiresPlugin) { diff --git a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc index 198d650..b8f9bc3 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc @@ -980,7 +980,7 @@ class SafeBrowsingDatabaseManagerCookieTest : public InProcessBrowserTest { ASSERT_TRUE(sb_service_.get() != NULL); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { sb_service_ = NULL; } diff --git a/chrome/browser/search/suggestions/thumbnail_manager_browsertest.cc b/chrome/browser/search/suggestions/thumbnail_manager_browsertest.cc index 2269634..166f770 100644 --- a/chrome/browser/search/suggestions/thumbnail_manager_browsertest.cc +++ b/chrome/browser/search/suggestions/thumbnail_manager_browsertest.cc @@ -64,7 +64,7 @@ class ThumbnailManagerBrowserTest : public InProcessBrowserTest { thumbnail_manager_.reset(CreateThumbnailManager(fake_db_)); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { fake_db_ = NULL; db_model_.clear(); thumbnail_manager_.reset(); diff --git a/chrome/browser/sessions/session_restore_browsertest_chromeos.cc b/chrome/browser/sessions/session_restore_browsertest_chromeos.cc index b8961e9..a0302cb 100644 --- a/chrome/browser/sessions/session_restore_browsertest_chromeos.cc +++ b/chrome/browser/sessions/session_restore_browsertest_chromeos.cc @@ -34,19 +34,6 @@ class SessionRestoreTestChromeOS : public InProcessBrowserTest { InProcessBrowserTest::SetUpCommandLine(command_line); } - virtual void SetUpOnMainThread() OVERRIDE { - InProcessBrowserTest::SetUpOnMainThread(); - } - - virtual void TearDownOnMainThread() OVERRIDE { - InProcessBrowserTest::TearDownOnMainThread(); - for (std::list<Browser*>::iterator iter = browser_list_.begin(); - iter != browser_list_.end(); ++iter) { - CloseBrowserSynchronously(*iter); - } - browser_list_.clear(); - } - Browser* CreateBrowserWithParams(Browser::CreateParams params) { Browser* browser = new Browser(params); AddBlankTabAndShow(browser); diff --git a/chrome/browser/ssl/ssl_client_certificate_selector_test.cc b/chrome/browser/ssl/ssl_client_certificate_selector_test.cc index d0318c6..d01f538 100644 --- a/chrome/browser/ssl/ssl_client_certificate_selector_test.cc +++ b/chrome/browser/ssl/ssl_client_certificate_selector_test.cc @@ -66,11 +66,11 @@ void SSLClientCertificateSelectorTestBase::SetUpOnMainThread() { // Have to release our reference to the auth handler during the test to allow // it to be destroyed while the Browser and its IO thread still exist. -void SSLClientCertificateSelectorTestBase::CleanUpOnMainThread() { +void SSLClientCertificateSelectorTestBase::TearDownOnMainThread() { BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, - base::Bind(&SSLClientCertificateSelectorTestBase::CleanUpOnIOThread, + base::Bind(&SSLClientCertificateSelectorTestBase::TearDownOnIOThread, this)); io_loop_finished_event_.Wait(); @@ -87,7 +87,7 @@ void SSLClientCertificateSelectorTestBase::SetUpOnIOThread() { io_loop_finished_event_.Signal(); } -void SSLClientCertificateSelectorTestBase::CleanUpOnIOThread() { +void SSLClientCertificateSelectorTestBase::TearDownOnIOThread() { delete url_request_; io_loop_finished_event_.Signal(); diff --git a/chrome/browser/ssl/ssl_client_certificate_selector_test.h b/chrome/browser/ssl/ssl_client_certificate_selector_test.h index a95ddac..9bf4b11 100644 --- a/chrome/browser/ssl/ssl_client_certificate_selector_test.h +++ b/chrome/browser/ssl/ssl_client_certificate_selector_test.h @@ -23,10 +23,10 @@ class SSLClientCertificateSelectorTestBase : public InProcessBrowserTest { // InProcessBrowserTest: virtual void SetUpInProcessBrowserTestFixture() OVERRIDE; virtual void SetUpOnMainThread() OVERRIDE; - virtual void CleanUpOnMainThread() OVERRIDE; + virtual void TearDownOnMainThread() OVERRIDE; virtual void SetUpOnIOThread(); - virtual void CleanUpOnIOThread(); + virtual void TearDownOnIOThread(); protected: scoped_ptr<net::URLRequest> MakeURLRequest( diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc index 1859b54..2b5daee 100644 --- a/chrome/browser/sync/test/integration/sync_test.cc +++ b/chrome/browser/sync/test/integration/sync_test.cc @@ -472,7 +472,7 @@ bool SyncTest::SetupSync() { return true; } -void SyncTest::CleanUpOnMainThread() { +void SyncTest::TearDownOnMainThread() { for (size_t i = 0; i < clients_.size(); ++i) { clients_[i]->service()->DisableForUser(); } diff --git a/chrome/browser/sync/test/integration/sync_test.h b/chrome/browser/sync/test/integration/sync_test.h index a4440fa..70fa9c4 100644 --- a/chrome/browser/sync/test/integration/sync_test.h +++ b/chrome/browser/sync/test/integration/sync_test.h @@ -257,9 +257,9 @@ class SyncTest : public InProcessBrowserTest { // on by default yet. virtual void AddOptionalTypesToCommandLine(base::CommandLine* cl); - // InProcessBrowserTest override. Destroys all the sync clients and sync + // BrowserTestBase override. Destroys all the sync clients and sync // profiles created by a test. - virtual void CleanUpOnMainThread() OVERRIDE; + virtual void TearDownOnMainThread() OVERRIDE; // InProcessBrowserTest override. Changes behavior of the default host // resolver to avoid DNS lookup errors. diff --git a/chrome/browser/ui/app_list/search/people/people_provider_browsertest.cc b/chrome/browser/ui/app_list/search/people/people_provider_browsertest.cc index b1c51f1..4b35d3d 100644 --- a/chrome/browser/ui/app_list/search/people/people_provider_browsertest.cc +++ b/chrome/browser/ui/app_list/search/people/people_provider_browsertest.cc @@ -183,7 +183,7 @@ class PeopleProviderTest : public InProcessBrowserTest { people_provider_->set_use_throttling(false); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { EXPECT_TRUE(test_server_->ShutdownAndWaitUntilComplete()); test_server_.reset(); } diff --git a/chrome/browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc b/chrome/browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc index 8f3f51d..f7444b0 100644 --- a/chrome/browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc +++ b/chrome/browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc @@ -88,7 +88,7 @@ class WebstoreProviderTest : public InProcessBrowserTest { webstore_provider_->set_use_throttling(false); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { EXPECT_TRUE(test_server_->ShutdownAndWaitUntilComplete()); test_server_.reset(); } diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc index fd98358..d9a1b24 100644 --- a/chrome/browser/ui/browser_browsertest.cc +++ b/chrome/browser/ui/browser_browsertest.cc @@ -854,7 +854,7 @@ class BeforeUnloadAtQuitWithTwoWindows : public InProcessBrowserTest { // This test is for testing a specific shutdown behavior. This mimics what // happens in InProcessBrowserTest::RunTestOnMainThread and QuitBrowsers, but // ensures that it happens through the single IDC_EXIT of the test. - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { // Cycle both the MessageLoop and the Cocoa runloop twice to flush out any // Chrome work that generates Cocoa work. Do this twice since there are two // Browsers that must be closed. diff --git a/chrome/browser/ui/cocoa/location_bar/zoom_decoration_browsertest.mm b/chrome/browser/ui/cocoa/location_bar/zoom_decoration_browsertest.mm index 86231dc..3e2579c 100644 --- a/chrome/browser/ui/cocoa/location_bar/zoom_decoration_browsertest.mm +++ b/chrome/browser/ui/cocoa/location_bar/zoom_decoration_browsertest.mm @@ -31,7 +31,7 @@ class ZoomDecorationTest : public InProcessBrowserTest { base::Unretained(this))); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { zoom_subscription_.reset(); } diff --git a/chrome/browser/ui/search/instant_extended_interactive_uitest.cc b/chrome/browser/ui/search/instant_extended_interactive_uitest.cc index fb0fcf0..8eca060 100644 --- a/chrome/browser/ui/search/instant_extended_interactive_uitest.cc +++ b/chrome/browser/ui/search/instant_extended_interactive_uitest.cc @@ -293,8 +293,8 @@ class InstantExtendedNetworkTest : public InstantExtendedTest { InstantExtendedTest::SetUpOnMainThread(); } - virtual void CleanUpOnMainThread() OVERRIDE { - InstantExtendedTest::CleanUpOnMainThread(); + virtual void TearDownOnMainThread() OVERRIDE { + InstantExtendedTest::TearDownOnMainThread(); fake_network_change_notifier_.reset(); disable_for_test_.reset(); } diff --git a/chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc b/chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc index aef6ca8..5194c79 100644 --- a/chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc +++ b/chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc @@ -65,7 +65,7 @@ class InstantExtendedManualTest : public InProcessBrowserTest, new net::NetworkChangeNotifier::DisableForTest()); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { disable_network_change_notifier_.reset(); } diff --git a/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc b/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc index 5e4b198..30be260 100644 --- a/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc +++ b/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc @@ -65,7 +65,7 @@ void TabModalConfirmDialogTest::SetUpOnMainThread() { content::RunAllPendingInMessageLoop(); } -void TabModalConfirmDialogTest::CleanUpOnMainThread() { +void TabModalConfirmDialogTest::TearDownOnMainThread() { content::RunAllPendingInMessageLoop(); } diff --git a/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.h b/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.h index f490e19..533cfd5 100644 --- a/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.h +++ b/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.h @@ -46,7 +46,7 @@ class TabModalConfirmDialogTest TabModalConfirmDialogTest(); virtual void SetUpOnMainThread() OVERRIDE; - virtual void CleanUpOnMainThread() OVERRIDE; + virtual void TearDownOnMainThread() OVERRIDE; // MockTabModalConfirmDialogDelegate::Delegate: virtual void OnAccepted() OVERRIDE; diff --git a/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc b/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc index e06bc6d..a3852d2 100644 --- a/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc +++ b/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc @@ -55,7 +55,7 @@ class TabScrubberTest : public InProcessBrowserTest, ash::EventTransformationHandler::TRANSFORM_NONE); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { browser()->tab_strip_model()->RemoveObserver(this); } diff --git a/chrome/browser/ui/views/message_center/web_notification_tray_browsertest.cc b/chrome/browser/ui/views/message_center/web_notification_tray_browsertest.cc index d0ad7d2..aa7871a 100644 --- a/chrome/browser/ui/views/message_center/web_notification_tray_browsertest.cc +++ b/chrome/browser/ui/views/message_center/web_notification_tray_browsertest.cc @@ -39,7 +39,7 @@ class WebNotificationTrayTest : public InProcessBrowserTest { WebNotificationTrayTest() {} virtual ~WebNotificationTrayTest() {} - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { message_center::MessageCenter::Get()->RemoveAllNotifications(false); } diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc index c677b8b..518126d 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc +++ b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc @@ -93,7 +93,7 @@ class SSLClientCertificateSelectorTest : public InProcessBrowserTest { // Have to release our reference to the auth handler during the test to allow // it to be destroyed while the Browser and its IO thread still exist. - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, base::Bind(&SSLClientCertificateSelectorTest::CleanUpOnIOThread, this)); @@ -192,10 +192,10 @@ class SSLClientCertificateSelectorMultiTabTest SSLClientCertificateSelectorTest::SetUpOnIOThread(); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { auth_requestor_2_ = NULL; auth_requestor_1_ = NULL; - SSLClientCertificateSelectorTest::CleanUpOnMainThread(); + SSLClientCertificateSelectorTest::TearDownOnMainThread(); } virtual void CleanUpOnIOThread() OVERRIDE { @@ -255,9 +255,9 @@ class SSLClientCertificateSelectorMultiProfileTest SSLClientCertificateSelectorTest::SetUpOnIOThread(); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { auth_requestor_1_ = NULL; - SSLClientCertificateSelectorTest::CleanUpOnMainThread(); + SSLClientCertificateSelectorTest::TearDownOnMainThread(); } virtual void CleanUpOnIOThread() OVERRIDE { diff --git a/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc b/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc index c218780..6e94f87 100644 --- a/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc +++ b/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc @@ -130,8 +130,8 @@ void WebUIBidiCheckerBrowserTestRTL::SetUpOnMainThread() { base::i18n::SetICUDefaultLocale("he"); } -void WebUIBidiCheckerBrowserTestRTL::CleanUpOnMainThread() { - WebUIBidiCheckerBrowserTest::CleanUpOnMainThread(); +void WebUIBidiCheckerBrowserTestRTL::TearDownOnMainThread() { + WebUIBidiCheckerBrowserTest::TearDownOnMainThread(); base::i18n::SetICUDefaultLocale(app_locale_); ResourceBundle::GetSharedInstance().OverrideLocalePakForTest( diff --git a/chrome/browser/ui/webui/bidi_checker_web_ui_test.h b/chrome/browser/ui/webui/bidi_checker_web_ui_test.h index 8a302b4..1d058f0 100644 --- a/chrome/browser/ui/webui/bidi_checker_web_ui_test.h +++ b/chrome/browser/ui/webui/bidi_checker_web_ui_test.h @@ -50,7 +50,7 @@ class WebUIBidiCheckerBrowserTestRTL : public WebUIBidiCheckerBrowserTest { protected: virtual void SetUpOnMainThread() OVERRIDE; - virtual void CleanUpOnMainThread() OVERRIDE; + virtual void TearDownOnMainThread() OVERRIDE; // The app locale before we change it std::string app_locale_; diff --git a/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc b/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc index 8db7f0d..27b794b 100644 --- a/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc +++ b/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc @@ -49,11 +49,11 @@ class AccountsOptionsTest : public LoginManagerTest { settings->AddSettingsProvider(&stub_settings_provider_); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { CrosSettings* settings = CrosSettings::Get(); settings->RemoveSettingsProvider(&stub_settings_provider_); settings->AddSettingsProvider(device_settings_provider_); - LoginManagerTest::CleanUpOnMainThread(); + LoginManagerTest::TearDownOnMainThread(); } virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { diff --git a/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc b/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc index dc2c9ff..a8255db 100644 --- a/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc +++ b/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc @@ -103,10 +103,10 @@ class SharedOptionsTest : public LoginManagerTest { settings->AddSettingsProvider(device_settings_provider_); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { CrosSettings* settings = CrosSettings::Get(); settings->RemoveSettingsProvider(&stub_settings_provider_); - LoginManagerTest::CleanUpOnMainThread(); + LoginManagerTest::TearDownOnMainThread(); } protected: diff --git a/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc b/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc index 13a9a09..a0d8458 100644 --- a/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc +++ b/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc @@ -157,7 +157,7 @@ class InlineLoginUISafeIframeBrowserTest : public InProcessBrowserTest { GURL(kFooWebUIURL).host(), &foo_provider_); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { test_factory_->RemoveFactoryOverride(GURL(kFooWebUIURL).host()); content::WebUIControllerFactory::UnregisterFactoryForTesting( test_factory_.get()); diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc index c6811ce..9fa29b5 100644 --- a/chrome/test/base/in_process_browser_test.cc +++ b/chrome/test/base/in_process_browser_test.cc @@ -432,7 +432,7 @@ void InProcessBrowserTest::RunTestOnMainThreadLoop() { // Invoke cleanup and quit even if there are failures. This is similar to // gtest in that it invokes TearDown even if Setup fails. - CleanUpOnMainThread(); + TearDownOnMainThread(); #if defined(OS_MACOSX) autorelease_pool_->Recycle(); #endif diff --git a/chrome/test/base/in_process_browser_test.h b/chrome/test/base/in_process_browser_test.h index 925846e..b0217d9 100644 --- a/chrome/test/base/in_process_browser_test.h +++ b/chrome/test/base/in_process_browser_test.h @@ -66,7 +66,7 @@ class ContentRendererClient; // related to the browser object and associated window, like opening a new Tab // with a testing page loaded. // -// CleanUpOnMainThread() is called just after executing the real test code to +// TearDownOnMainThread() is called just after executing the real test code to // do necessary cleanup before the browser is torn down. // // TearDownInProcessBrowserTestFixture() is called after BrowserMain() exits to @@ -122,10 +122,6 @@ class InProcessBrowserTest : public content::BrowserTestBase { // successful. virtual bool SetUpUserDataDirectory() WARN_UNUSED_RESULT; - // Override this to add any custom cleanup code that needs to be done on the - // main thread before the browser is torn down. - virtual void CleanUpOnMainThread() {} - // BrowserTestBase: virtual void RunTestOnMainThreadLoop() OVERRIDE; diff --git a/chrome/test/base/test_chrome_web_ui_controller_factory_browsertest.cc b/chrome/test/base/test_chrome_web_ui_controller_factory_browsertest.cc index c58eace..4449b3f 100644 --- a/chrome/test/base/test_chrome_web_ui_controller_factory_browsertest.cc +++ b/chrome/test/base/test_chrome_web_ui_controller_factory_browsertest.cc @@ -52,7 +52,7 @@ class TestChromeWebUIControllerFactoryTest : public InProcessBrowserTest { GURL(kChromeTestChromeWebUIControllerFactory).host(), &mock_provider_); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { test_factory_->RemoveFactoryOverride( GURL(kChromeTestChromeWebUIControllerFactory).host()); content::WebUIControllerFactory::UnregisterFactoryForTesting( diff --git a/chrome/test/base/web_ui_browser_test.cc b/chrome/test/base/web_ui_browser_test.cc index 7451f2b..cf9a2aa 100644 --- a/chrome/test/base/web_ui_browser_test.cc +++ b/chrome/test/base/web_ui_browser_test.cc @@ -382,7 +382,7 @@ void WebUIBrowserTest::SetUpOnMainThread() { mock_provider_.Pointer()); } -void WebUIBrowserTest::CleanUpOnMainThread() { +void WebUIBrowserTest::TearDownOnMainThread() { logging::SetLogMessageHandler(NULL); test_factory_->RemoveFactoryOverride(GURL(kDummyURL).host()); diff --git a/chrome/test/base/web_ui_browser_test.h b/chrome/test/base/web_ui_browser_test.h index 9aff3c2..3220442 100644 --- a/chrome/test/base/web_ui_browser_test.h +++ b/chrome/test/base/web_ui_browser_test.h @@ -113,7 +113,7 @@ class WebUIBrowserTest : public JavaScriptBrowserTest { // Set up & tear down console error catching. virtual void SetUpOnMainThread() OVERRIDE; - virtual void CleanUpOnMainThread() OVERRIDE; + virtual void TearDownOnMainThread() OVERRIDE; // Set a WebUI instance to run tests on. void SetWebUIInstance(content::WebUI* web_ui); diff --git a/extensions/browser/api/usb/usb_apitest.cc b/extensions/browser/api/usb/usb_apitest.cc index 3d6788d..8d6fb55 100644 --- a/extensions/browser/api/usb/usb_apitest.cc +++ b/extensions/browser/api/usb/usb_apitest.cc @@ -187,7 +187,7 @@ class UsbApiTest : public ExtensionApiTest { UsbService::SetInstanceForTest(new MockUsbService(mock_device_)); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { scoped_refptr<content::MessageLoopRunner> runner = new content::MessageLoopRunner; UsbService* service = NULL; |