diff options
| -rw-r--r-- | chrome/browser/extensions/browser_action_apitest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/extensions/browser_action_apitest.cc b/chrome/browser/extensions/browser_action_apitest.cc index 915e7af..ea0b6dd 100644 --- a/chrome/browser/extensions/browser_action_apitest.cc +++ b/chrome/browser/extensions/browser_action_apitest.cc @@ -143,7 +143,14 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, TabSpecificBrowserActionState) { EXPECT_EQ("hi!", GetBrowserActionsBar().GetTooltip(0)); } -IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, BrowserActionPopup) { +// http://code.google.com/p/chromium/issues/detail?id=70829 +// Only mac is okay. +#if !defined(OS_MACOSX) +#define MAYBE_BrowserActionPopup FLAKY_BrowserActionPopup +#else +#define MAYBE_BrowserActionPopup BrowserActionPopup +#endif +IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, MAYBE_BrowserActionPopup) { ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII( "browser_action/popup"))); BrowserActionTestUtil actions_bar = GetBrowserActionsBar(); |