summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrdsmith@chromium.org <rdsmith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-13 12:45:43 +0000
committerrdsmith@chromium.org <rdsmith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-13 12:45:43 +0000
commit18ffd61dde1ab4c87a123dc772d5e68974cf8740 (patch)
tree04e4d583bed00a8a35ab83d17692bbbd63dee529
parent2d1d3b478115ee1a7cd7c0e28e9f5a9465fddba5 (diff)
downloadchromium_src-18ffd61dde1ab4c87a123dc772d5e68974cf8740.zip
chromium_src-18ffd61dde1ab4c87a123dc772d5e68974cf8740.tar.gz
chromium_src-18ffd61dde1ab4c87a123dc772d5e68974cf8740.tar.bz2
Marked TwoExtensionsIgnoreFirst flaky on Linux.
R=zea@chromium.org BUG=89078 TEST=None Review URL: http://codereview.chromium.org/7344016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92355 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/extensions/extension_crash_recovery_browsertest.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc
index 6e3f1d1..b6e9db1 100644
--- a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc
+++ b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc
@@ -350,7 +350,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest,
ASSERT_EQ(size_before, GetExtensionService()->extensions()->size());
}
-IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, TwoExtensionsIgnoreFirst) {
+// Flaky on linux due to http://crbug.com/89078.
+#if defined(OS_LINUX)
+#define MAYBE_TwoExtensionsIgnoreFirst FLAKY_TwoExtensionsIgnoreFirst
+#else
+#define MAYBE_TwoExtensionsIgnoreFirst TwoExtensionsIgnoreFirst
+#endif // defined(OS_LINUX)
+IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest,
+ MAYBE_TwoExtensionsIgnoreFirst) {
const size_t size_before = GetExtensionService()->extensions()->size();
LoadTestExtension();
LoadSecondExtension();