Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3424)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/login/test/oobe_base_test.cc

Issue 366813007: Removed InProcessBrowserTest::CleanUpOnMainThread() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More merge to ToT. Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/chromeos/login/managed/managed_user_test_base.cc ('K') | « chrome/browser/chromeos/login/test/oobe_base_test.h ('k') | chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h » ('j') | chrome/browser/password_manager/password_manager_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/test/oobe_base_test.cc
diff --git a/chrome/browser/chromeos/login/test/oobe_base_test.cc b/chrome/browser/chromeos/login/test/oobe_base_test.cc
index 583a3eb9008a1df86406f68fe15c58ea31691e2e..ba751a16f12136e8c836a5c2de3b0b548bbc54c4 100644
--- a/chrome/browser/chromeos/login/test/oobe_base_test.cc
+++ b/chrome/browser/chromeos/login/test/oobe_base_test.cc
@@ -71,7 +71,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,
@@ -79,7 +79,7 @@ void OobeBaseTest::CleanUpOnMainThread() {
content::RunMessageLoop();
}
- ExtensionApiTest::CleanUpOnMainThread();
+ ExtensionApiTest::TearDownOnMainThread();
}
void OobeBaseTest::SetUpCommandLine(CommandLine* command_line) {
« chrome/browser/chromeos/login/managed/managed_user_test_base.cc ('K') | « chrome/browser/chromeos/login/test/oobe_base_test.h ('k') | chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h » ('j') | chrome/browser/password_manager/password_manager_browsertest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698