Commit 48f05122 authored by Benjamin Ackerman's avatar Benjamin Ackerman Committed by Commit Bot

[Extensions] Re-enabling the ContentScriptIsolatedWorlds API test.

The test passes locally and on the trybots now.

Bug: 163097
Change-Id: I0d7207a2548a568c33241d30ed1bbd7ea2cb4d6a
Reviewed-on: https://chromium-review.googlesource.com/1236922Reviewed-by: default avatarIstiaque Ahmed <lazyboy@chromium.org>
Commit-Queue: Benjamin Ackerman <ackermanb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#592975}
parent ba565547
...@@ -195,14 +195,7 @@ IN_PROC_BROWSER_TEST_F(ContentScriptApiTest, ContentScriptFragmentNavigation) { ...@@ -195,14 +195,7 @@ IN_PROC_BROWSER_TEST_F(ContentScriptApiTest, ContentScriptFragmentNavigation) {
ASSERT_TRUE(RunExtensionTest(extension_name)) << message_; ASSERT_TRUE(RunExtensionTest(extension_name)) << message_;
} }
// Times out on Linux: http://crbug.com/163097 IN_PROC_BROWSER_TEST_F(ContentScriptApiTest, ContentScriptIsolatedWorlds) {
#if defined(OS_LINUX)
#define MAYBE_ContentScriptIsolatedWorlds DISABLED_ContentScriptIsolatedWorlds
#else
#define MAYBE_ContentScriptIsolatedWorlds ContentScriptIsolatedWorlds
#endif
IN_PROC_BROWSER_TEST_F(ContentScriptApiTest,
MAYBE_ContentScriptIsolatedWorlds) {
// This extension runs various bits of script and tests that they all run in // This extension runs various bits of script and tests that they all run in
// the same isolated world. // the same isolated world.
ASSERT_TRUE(StartEmbeddedTestServer()); ASSERT_TRUE(StartEmbeddedTestServer());
......
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