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

Unified Diff: extensions/shell/test/shell_test.cc

Issue 2832153003: Move calling of shared browser test methods like SetUpOnMainThread/TearDownOnMainThread/RunTestOn... (Closed)
Patch Set: sync Created 3 years, 8 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
« no previous file with comments | « extensions/shell/test/shell_test.h ('k') | headless/test/headless_browser_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/shell/test/shell_test.cc
diff --git a/extensions/shell/test/shell_test.cc b/extensions/shell/test/shell_test.cc
index 0d50551341e89f36e0303647fa108cba899a9dac..a6930d9be2be480604fcdba857bd4ddf545451c4 100644
--- a/extensions/shell/test/shell_test.cc
+++ b/extensions/shell/test/shell_test.cc
@@ -47,24 +47,20 @@ void AppShellTest::SetUp() {
content::BrowserTestBase::SetUp();
}
-void AppShellTest::SetUpOnMainThread() {
+void AppShellTest::PreRunTestOnMainThread() {
browser_context_ = ShellContentBrowserClient::Get()->GetBrowserContext();
extension_system_ = static_cast<ShellExtensionSystem*>(
ExtensionSystem::Get(browser_context_));
extension_system_->Init();
-}
-
-void AppShellTest::RunTestOnMainThreadLoop() {
DCHECK(base::MessageLoopForUI::IsCurrent());
base::RunLoop().RunUntilIdle();
- SetUpOnMainThread();
-
- RunTestOnMainThread();
-
- TearDownOnMainThread();
+ // TODO(jam): remove this.
+ disable_io_checks();
+}
+void AppShellTest::PostRunTestOnMainThread() {
// Clean up the app window.
DesktopController::instance()->CloseAppWindows();
}
« no previous file with comments | « extensions/shell/test/shell_test.h ('k') | headless/test/headless_browser_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698