Un-mark UILayoutTests as flaky

chrome/browser/media_uitest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "app/gfx/gl/gl_implementation.h"
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/string_util.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/platform_thread.h"
@@ skipping 48 matching lines @@
 
   void PlayAudio(const char* url) {
     PlayMedia("audio", url);
   }
 
   void PlayVideo(const char* url) {
     PlayMedia("video", url);
   }
 };
 
-#if defined(OS_LINUX) || defined(OS_WIN)
-// Test appears to be fine on linux, but let's first change to flaky and
-// see how that goes.
-// http://crbug.com/56364
-#define MediaUILayoutTest FLAKY_MediaUILayoutTest
-#endif
-
 TEST_F(MediaTest, VideoBearTheora) {
   PlayVideo("bear.ogv");
 }
 
 TEST_F(MediaTest, VideoBearSilentTheora) {
   PlayVideo("bear_silent.ogv");
 }
 
 TEST_F(MediaTest, VideoBearWebm) {
   PlayVideo("bear.webm");
@@ skipping 40 matching lines @@
   InitializeForLayoutTest(test_dir, media_test_dir, kNoHttpPort);
 
   // Copy resources first.
   for (size_t i = 0; i < arraysize(kResources); ++i)
     AddResourceForLayoutTest(
         test_dir, media_test_dir.AppendASCII(kResources[i]));
 
   for (size_t i = 0; i < arraysize(kMediaTests); ++i)
     RunLayoutTest(kMediaTests[i], kNoHttpPort);
 }