summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorlzheng@chromium.org <lzheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-27 01:45:15 +0000
committerlzheng@chromium.org <lzheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-27 01:45:15 +0000
commita999ab29cbfd88365b88c00a8b482de97044572f (patch)
treeac7a642cd6f24553ad2578b030397411155864a0 /chrome
parent3c64d3a5e21500334357e75de188d8f161f6af1d (diff)
downloadchromium_src-a999ab29cbfd88365b88c00a8b482de97044572f.zip
chromium_src-a999ab29cbfd88365b88c00a8b482de97044572f.tar.gz
chromium_src-a999ab29cbfd88365b88c00a8b482de97044572f.tar.bz2
Mark BrowserActionPopup disabled except Mac since it times out.
BUG=70829 test=none Review URL: http://codereview.chromium.org/6382010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72743 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/extensions/browser_action_apitest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/extensions/browser_action_apitest.cc b/chrome/browser/extensions/browser_action_apitest.cc
index ea0b6dd..faa78e3 100644
--- a/chrome/browser/extensions/browser_action_apitest.cc
+++ b/chrome/browser/extensions/browser_action_apitest.cc
@@ -146,7 +146,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, TabSpecificBrowserActionState) {
// http://code.google.com/p/chromium/issues/detail?id=70829
// Only mac is okay.
#if !defined(OS_MACOSX)
-#define MAYBE_BrowserActionPopup FLAKY_BrowserActionPopup
+#define MAYBE_BrowserActionPopup DISABLED_BrowserActionPopup
#else
#define MAYBE_BrowserActionPopup BrowserActionPopup
#endif