diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-06 20:19:27 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-06 20:19:27 +0000 |
| commit | d7f4bae17731bdf1420050c6a9edb5efb3c8459d (patch) | |
| tree | 3a83401fdc77f2e8265c49f5f0a8c8d3a9caa9e8 /chrome/browser | |
| parent | c63fa11504befae3bb9f4151480d439f36ad0662 (diff) | |
| download | chromium_src-d7f4bae17731bdf1420050c6a9edb5efb3c8459d.zip chromium_src-d7f4bae17731bdf1420050c6a9edb5efb3c8459d.tar.gz chromium_src-d7f4bae17731bdf1420050c6a9edb5efb3c8459d.tar.bz2 | |
Another attempt at fixing IncognitoSplitMode apitest.
Create the ExtensionTestMessageListeners before loading the extension. Also use different messages for incognito vs regular mode to avoid interference. Fix suggested by kalman.
BUG=53991
TEST=no
Review URL: http://codereview.chromium.org/8154001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104356 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/extensions/extension_incognito_apitest.cc | 8 |
1 files changed, 4 insertions, 4 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"); |