Stop running media layout tests as browser tests

content/browser/media/media_browsertest.cc

 // Copyright (c) 2013 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 "content/browser/media/media_browsertest.h"
 
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/shell/shell.h"
 #include "content/test/content_browser_test_utils.h"
-#include "content/test/layout_browsertest.h"
 
 // TODO(wolenetz): Fix Media.YUV* tests on MSVS 2012 x64. crbug.com/180074
 #if defined(OS_WIN) && defined(ARCH_CPU_X86_64) && _MSC_VER == 1700
 #define MAYBE(x) DISABLED_##x
 #else
 #define MAYBE(x) x
 #endif
 
 namespace content {
 
@@ skipping 161 matching lines @@
 // Covers tear-down when navigating away as opposed to browser exiting.
 IN_PROC_BROWSER_TEST_F(MediaTest, Navigate) {
   PlayVideo("bear.ogv", false);
   NavigateToURL(shell(), GURL("about:blank"));
   EXPECT_FALSE(shell()->web_contents()->IsCrashed());
 }
 
 INSTANTIATE_TEST_CASE_P(File, MediaTest, ::testing::Values(false));
 INSTANTIATE_TEST_CASE_P(Http, MediaTest, ::testing::Values(true));
 
-class MediaLayoutTest : public InProcessBrowserLayoutTest {
- protected:
-  MediaLayoutTest() : InProcessBrowserLayoutTest(
-      base::FilePath(), base::FilePath().AppendASCII("media")) {
-  }
-  virtual ~MediaLayoutTest() {}
-};
-
-// Each browser test can only correspond to a single layout test, otherwise the
-// 45 second timeout per test is not long enough for N tests on debug/asan/etc
-// builds.
-
-IN_PROC_BROWSER_TEST_F(MediaLayoutTest, VideoAutoplayTest) {
-  RunLayoutTest("video-autoplay.html");
-}
-
-IN_PROC_BROWSER_TEST_F(MediaLayoutTest, VideoLoopTest) {
-  RunLayoutTest("video-loop.html");
-}
-
-IN_PROC_BROWSER_TEST_F(MediaLayoutTest, VideoNoAutoplayTest) {
-  RunLayoutTest("video-no-autoplay.html");
-}
-
 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv420pTheora)) {
   RunColorFormatTest("yuv420p.ogv", "ENDED");
 }
 
 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv422pTheora)) {
   RunColorFormatTest("yuv422p.ogv", "ENDED");
 }
 
 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv444pTheora)) {
   // TODO(scherkus): Support YUV444 http://crbug.com/104711
@@ skipping 23 matching lines @@
 }
 
 #if defined(OS_CHROMEOS)
 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pMpeg4) {
   RunColorFormatTest("yuv420p.avi", "ENDED");
 }
 #endif
 #endif
 
 }  // namespace content