summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authorrafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-02 16:25:41 +0000
committerrafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-02 16:25:41 +0000
commitb84129962c1fb9f411ed6acf9f263fbf1f40e959 (patch)
tree99433636675a30e8b99ef13de5f9cc2a04d57706 /chrome/browser/extensions
parent6515da1e1a37f89a43af399b2642ef00aa11690a (diff)
downloadchromium_src-b84129962c1fb9f411ed6acf9f263fbf1f40e959.zip
chromium_src-b84129962c1fb9f411ed6acf9f263fbf1f40e959.tar.gz
chromium_src-b84129962c1fb9f411ed6acf9f263fbf1f40e959.tar.bz2
ExtensionApiTest.Tabs is flaky on linux views
TBR=sky BUG=61592 TEST= Review URL: http://codereview.chromium.org/4316001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64755 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/extension_tabs_apitest.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc
index 043e23b..f43ae95 100644
--- a/chrome/browser/extensions/extension_tabs_apitest.cc
+++ b/chrome/browser/extensions/extension_tabs_apitest.cc
@@ -16,7 +16,14 @@
#define MAYBE_TabOnRemoved TabOnRemoved
#endif
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Tabs) {
+// Flaky on linux views. http://crbug.com/61592
+#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS)
+#define MAYBE_Tabs FLAKY_Tabs
+#else
+#define MAYBE_Tabs Tabs
+#endif
+
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Tabs) {
ASSERT_TRUE(test_server()->Start());
// The test creates a tab and checks that the URL of the new tab