| Index: chrome/browser/search/hotword_installer_browsertest.cc
|
| diff --git a/chrome/browser/search/hotword_installer_browsertest.cc b/chrome/browser/search/hotword_installer_browsertest.cc
|
| index 8cdb90529c1aac6d48b5a0a5d9b9c04d99d35683..2aa7eead0e39ec26f97354aa874510fec06f60cb 100644
|
| --- a/chrome/browser/search/hotword_installer_browsertest.cc
|
| +++ b/chrome/browser/search/hotword_installer_browsertest.cc
|
| @@ -89,9 +89,18 @@ class HotwordInstallerBrowserTest : public ExtensionBrowserTest {
|
| DISALLOW_COPY_AND_ASSIGN(HotwordInstallerBrowserTest);
|
| };
|
|
|
| +// Disabled on Windows due to https://crbug.com/717648. Since the installation
|
| +// is still in progress during shutdown, file handles may still be open. This
|
| +// causes TestingProfile to crash during shutdown.
|
| +#if defined(OS_WIN)
|
| +#define Maybe_AbortInstallOnShutdown DISABLED_AbortInstallOnShutdown
|
| +#else
|
| +#define Maybe_AbortInstallOnShutdown AbortInstallOnShutdown
|
| +#endif
|
| // Test that installing to a non-existent URL (which should hang) does not
|
| // crash. This test is successful if it does not crash and trigger any DCHECKS.
|
| -IN_PROC_BROWSER_TEST_F(HotwordInstallerBrowserTest, AbortInstallOnShutdown) {
|
| +IN_PROC_BROWSER_TEST_F(HotwordInstallerBrowserTest,
|
| + Maybe_AbortInstallOnShutdown) {
|
| TestingProfile test_profile;
|
| HotwordServiceFactory* hotword_service_factory =
|
| HotwordServiceFactory::GetInstance();
|
|
|