| 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..ccfaed9262a54aa312d198956e9f5cb423ab4da4 100644
|
| --- a/extensions/shell/test/shell_test.cc
|
| +++ b/extensions/shell/test/shell_test.cc
|
| @@ -47,24 +47,17 @@ 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();
|
| -
|
| +void AppShellTest::PostRunTestOnMainThread() {
|
| // Clean up the app window.
|
| DesktopController::instance()->CloseAppWindows();
|
| }
|
|
|