summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-22 01:15:47 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-22 01:15:47 +0000
commitd3af520955a2a35f8eab164523b8c498a524e948 (patch)
treed1fc4bc783e3abbd205ba1e1b583c4eaa653cdab /chrome
parenta727b91cdedfd93fe805d21599471e52c59656b6 (diff)
downloadchromium_src-d3af520955a2a35f8eab164523b8c498a524e948.zip
chromium_src-d3af520955a2a35f8eab164523b8c498a524e948.tar.gz
chromium_src-d3af520955a2a35f8eab164523b8c498a524e948.tar.bz2
Unmark ExtensionsLoadTest.Test as flaky. It doesn't appear
to flake anymore on windows or linux. For some reason it doesn't show up in the flakiness dashboard at all for mac, but a spot check of recent builds show similar rock-solidness. TBR=phajdan.jr@chromium.org BUG=46301 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63466 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/extensions/extension_startup_browsertest.cc8
1 files changed, 1 insertions, 7 deletions
diff --git a/chrome/browser/extensions/extension_startup_browsertest.cc b/chrome/browser/extensions/extension_startup_browsertest.cc
index 3f961f7..d0eed8c 100644
--- a/chrome/browser/extensions/extension_startup_browsertest.cc
+++ b/chrome/browser/extensions/extension_startup_browsertest.cc
@@ -200,13 +200,7 @@ class ExtensionsLoadTest : public ExtensionStartupTestBase {
}
};
-// Flaky (times out) on Mac/Windows. http://crbug.com/46301.
-#if defined(OS_MACOSX) || defined(OS_WIN)
-#define MAYBE_Test FLAKY_Test
-#else
-#define MAYBE_Test Test
-#endif
-IN_PROC_BROWSER_TEST_F(ExtensionsLoadTest, MAYBE_Test) {
+IN_PROC_BROWSER_TEST_F(ExtensionsLoadTest, Test) {
WaitForServicesToStart(1, false);
TestInjection(true, true);
}