| Index: chrome/browser/chromeos/login/auto_launched_kiosk_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/login/auto_launched_kiosk_browsertest.cc b/chrome/browser/chromeos/login/auto_launched_kiosk_browsertest.cc
|
| index 3371e70aa2c1933faa5e372a2c4f5b0520f87783..4c41f62a54712c95bfa88a0cad6d9271ff3208db 100644
|
| --- a/chrome/browser/chromeos/login/auto_launched_kiosk_browsertest.cc
|
| +++ b/chrome/browser/chromeos/login/auto_launched_kiosk_browsertest.cc
|
| @@ -324,6 +324,11 @@ class AutoLaunchedKioskTest : public ExtensionApiTest {
|
| ExtensionApiTest::SetUpInProcessBrowserTestFixture();
|
| }
|
|
|
| + void PreRunTestOnMainThread() override {
|
| + termination_observer_.reset(new TerminationObserver());
|
| + InProcessBrowserTest::PreRunTestOnMainThread();
|
| + }
|
| +
|
| void SetUpOnMainThread() override {
|
| extensions::browsertest_util::CreateAndInitializeLocalCache();
|
|
|
| @@ -332,12 +337,6 @@ class AutoLaunchedKioskTest : public ExtensionApiTest {
|
| ExtensionApiTest::SetUpOnMainThread();
|
| }
|
|
|
| - void RunTestOnMainThreadLoop() override {
|
| - termination_observer_.reset(new TerminationObserver());
|
| -
|
| - ExtensionApiTest::RunTestOnMainThreadLoop();
|
| - }
|
| -
|
| void TearDownOnMainThread() override {
|
| termination_observer_.reset();
|
|
|
|
|