Commit d27e959d authored by lfg's avatar lfg Committed by Commit bot

Fix ExtensionWebRequestApiTest.ExtensionRequests test in --isolate-extensions.

Check for the isolate-extensions flag as well as --site-per-process.

BUG=532666

Review URL: https://codereview.chromium.org/1469153003

Cr-Commit-Position: refs/heads/master@{#361377}
parent 51b09104
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/login/login_prompt.h" #include "chrome/browser/ui/login/login_prompt.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/common/extensions/extension_process_policy.h"
#include "chrome/test/base/ui_test_utils.h" #include "chrome/test/base/ui_test_utils.h"
#include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_registrar.h"
#include "content/public/browser/notification_service.h" #include "content/public/browser/notification_service.h"
...@@ -379,7 +380,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, ExtensionRequests) { ...@@ -379,7 +380,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, ExtensionRequests) {
listener_result.Reset(); listener_result.Reset();
listener_main2.Reply(""); listener_main2.Reply("");
EXPECT_TRUE(listener_result.WaitUntilSatisfied()); EXPECT_TRUE(listener_result.WaitUntilSatisfied());
if (content::AreAllSitesIsolatedForTesting()) { if (content::AreAllSitesIsolatedForTesting() ||
extensions::IsIsolateExtensionsEnabled()) {
// With --site-per-process, the extension frame does run in the extension's // With --site-per-process, the extension frame does run in the extension's
// process. // process.
EXPECT_EQ("Intercepted requests: ?contentscript", EXPECT_EQ("Intercepted requests: ?contentscript",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment