Chromium Code Reviews| Index: chrome/browser/extensions/process_management_browsertest.cc |
| diff --git a/chrome/browser/extensions/process_management_browsertest.cc b/chrome/browser/extensions/process_management_browsertest.cc |
| index 4adbd2f7142bc14a018437a7b2c5ad1a935b5bf0..012fb553d0cf27c65aba7a9f90c980fe9cedae4e 100644 |
| --- a/chrome/browser/extensions/process_management_browsertest.cc |
| +++ b/chrome/browser/extensions/process_management_browsertest.cc |
| @@ -361,9 +361,21 @@ IN_PROC_BROWSER_TEST_F(ChromeWebStoreProcessTest, |
| // Store gallery URL (which will commit into a chrome-extension://cws-app-id). |
| bool ignored_script_result = false; |
| content::TestNavigationObserver nav_observer(web_contents, 1); |
| + content::RenderProcessHostWatcher crash_observer( |
| + web_contents->GetMainFrame()->GetProcess(), |
| + content::RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); |
| + |
| EXPECT_TRUE(content::ExecuteScriptAndExtractBool( |
| web_contents, navigation_starting_script, &ignored_script_result)); |
| + // When --isolate-extensions is enabled, the expectation is that the store |
| + // will be properly put in its own process, otherwise the renderer process |
| + // is going to be terminated. |
|
Charlie Reis
2016/10/28 23:46:33
Is this saying that we'll kill the process in non-
nasko
2016/10/29 17:02:41
Yes, it will regress that, since the fix was depen
|
| + if (!extensions::IsIsolateExtensionsEnabled()) { |
| + crash_observer.Wait(); |
| + return; |
| + } |
| + |
| // Verify that the navigation succeeded. |
| nav_observer.Wait(); |
| EXPECT_EQ(cws_web_url, web_contents->GetLastCommittedURL()); |
| @@ -376,6 +388,5 @@ IN_PROC_BROWSER_TEST_F(ChromeWebStoreProcessTest, |
| extensions::kWebStoreAppId, new_process_host->GetID())); |
| // Verify that Chrome Web Store is isolated in a separate renderer process. |
| - if (extensions::IsIsolateExtensionsEnabled()) |
| - EXPECT_NE(old_process_host, new_process_host); |
| + EXPECT_NE(old_process_host, new_process_host); |
| } |