diff options
| author | annacc@chromium.org <annacc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-03 21:04:19 +0000 |
|---|---|---|
| committer | annacc@chromium.org <annacc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-03 21:04:19 +0000 |
| commit | 4a66bd015629296373bfa5d10eb9d4f721d049c4 (patch) | |
| tree | 74793fac73cbcad52c92f266217ec576e47e6759 | |
| parent | ab294ad892a2ad4b4aa495789aa106b9d5dfb842 (diff) | |
| download | chromium_src-4a66bd015629296373bfa5d10eb9d4f721d049c4.zip chromium_src-4a66bd015629296373bfa5d10eb9d4f721d049c4.tar.gz chromium_src-4a66bd015629296373bfa5d10eb9d4f721d049c4.tar.bz2 | |
Unmark UILayoutTest.MediaUILayoutTest flaky on Mac
This flakiness was fixed with r87616 so unmarking the test as flaky.
BUG=84463
TEST=UILayoutTest.MediaUILayoutTest
Review URL: http://codereview.chromium.org/7024018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87859 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/media_uitest.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/chrome/browser/media_uitest.cc b/chrome/browser/media_uitest.cc index e344d0b..a07bd63 100644 --- a/chrome/browser/media_uitest.cc +++ b/chrome/browser/media_uitest.cc @@ -107,14 +107,7 @@ TEST_F(MediaTest, MAYBE_VideoBearWav) { PlayVideo("bear.wav"); } -#if defined(OS_MACOSX) -// http://crbug.com/84463 - MediaUILayoutTest is flaky on Mac. -#define MAYBE_MediaUILayoutTest FLAKY_MediaUILayoutTest -#else -#define MAYBE_MediaUILayoutTest MediaUILayoutTest -#endif - -TEST_F(UILayoutTest, MAYBE_MediaUILayoutTest) { +TEST_F(UILayoutTest, MediaUILayoutTest) { static const char* kResources[] = { "content", "media-file.js", |