Chromium Code Reviews| Index: chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc |
| diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc |
| index 2fb92ddeeb316d40db6c4e93d77b1ed658ce7a93..1b96110af55a4711d143ab521a3767830a070a3f 100644 |
| --- a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc |
| +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc |
| @@ -110,18 +110,14 @@ class ExtensionWebstorePrivateApiTest : public ExtensionApiTest { |
| "http://www.example.com/extensions/api_test"); |
| } |
| - void SetUpInProcessBrowserTestFixture() override { |
| - ExtensionApiTest::SetUpInProcessBrowserTestFixture(); |
| + void SetUpOnMainThread() override { |
| + ExtensionApiTest::SetUpOnMainThread(); |
| // Start up the test server and get us ready for calling the install |
| // API functions. |
| host_resolver()->AddRule("www.example.com", "127.0.0.1"); |
| ASSERT_TRUE(StartEmbeddedTestServer()); |
| extensions::ExtensionInstallUI::set_disable_failure_ui_for_tests(); |
| - } |
| - |
| - void SetUpOnMainThread() override { |
| - ExtensionApiTest::SetUpOnMainThread(); |
| auto_confirm_install_.reset( |
| new ScopedTestDialogAutoConfirm(ScopedTestDialogAutoConfirm::ACCEPT)); |
| @@ -132,6 +128,10 @@ class ExtensionWebstorePrivateApiTest : public ExtensionApiTest { |
| &webstore_install_dir_copy_); |
| } |
| + void TearDownOnMainThread() override { |
|
Devlin
2017/02/15 19:24:34
Shouldn't need this.
nasko
2017/02/15 19:34:57
Done.
|
| + ExtensionApiTest::TearDownOnMainThread(); |
| + } |
| + |
| protected: |
| // Returns a test server URL, but with host 'www.example.com' so it matches |
| // the web store app's extent that we set up via command line flags. |