diff options
| -rw-r--r-- | chrome/browser/extensions/extension_incognito_apitest.cc | 8 | ||||
| -rw-r--r-- | chrome/test/data/extensions/api_test/incognito/split/background.html | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/chrome/browser/extensions/extension_incognito_apitest.cc b/chrome/browser/extensions/extension_incognito_apitest.cc index 2c0cf01..4dea085 100644 --- a/chrome/browser/extensions/extension_incognito_apitest.cc +++ b/chrome/browser/extensions/extension_incognito_apitest.cc @@ -117,8 +117,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FLAKY_Incognito) { // Tests that the APIs in an incognito-enabled split-mode extension work // properly. -// Hangs flakily on mac, linux, win: http://crbug.com/53991 -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_IncognitoSplitMode) { +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoSplitMode) { host_resolver()->AddRule("*", "127.0.0.1"); ASSERT_TRUE(StartTestServer()); @@ -130,6 +129,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_IncognitoSplitMode) { catcher_incognito.RestrictToProfile( browser()->profile()->GetOffTheRecordProfile()); + ExtensionTestMessageListener listener("waiting", true); + ExtensionTestMessageListener listener_incognito("waiting_incognito", true); + // Open incognito window and navigate to test page. ui_test_utils::OpenURLOffTheRecord( browser()->profile(), @@ -139,9 +141,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_IncognitoSplitMode) { .AppendASCII("incognito").AppendASCII("split"))); // Wait for both extensions to be ready before telling them to proceed. - ExtensionTestMessageListener listener("waiting", true); EXPECT_TRUE(listener.WaitUntilSatisfied()); - ExtensionTestMessageListener listener_incognito("waiting", true); EXPECT_TRUE(listener_incognito.WaitUntilSatisfied()); listener.Reply("go"); listener_incognito.Reply("go"); diff --git a/chrome/test/data/extensions/api_test/incognito/split/background.html b/chrome/test/data/extensions/api_test/incognito/split/background.html index a84e5d3..01230f9 100644 --- a/chrome/test/data/extensions/api_test/incognito/split/background.html +++ b/chrome/test/data/extensions/api_test/incognito/split/background.html @@ -130,7 +130,9 @@ chrome.test.getConfig(function(config) { done(); } }); - chrome.test.sendMessage("waiting", pass(function() { + var message = + inIncognitoContext ? "waiting_incognito" : "waiting"; + chrome.test.sendMessage(message, pass(function() { chrome.bookmarks.create(node, pass(function(results) { node.id = results.id; // since we couldn't know this going in node.index = results.index; |