Convert the media and audio UI test to a browser_test. browser_tests are sharded and run quicker, a…

chrome/browser/media_uitest.cc

Index: chrome/browser/media_uitest.cc
===================================================================
--- chrome/browser/media_uitest.cc	(revision 129871)
+++ chrome/browser/media_uitest.cc	(working copy)
@@ -1,165 +0,0 @@
-// Copyright (c) 2012 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 "base/basictypes.h"
-#include "base/file_path.h"
-#include "base/stringprintf.h"
-#include "base/string_util.h"
-#include "base/test/test_timeouts.h"
-#include "base/threading/platform_thread.h"
-#include "chrome/common/chrome_switches.h"
-#include "chrome/test/base/test_launcher_utils.h"
-#include "chrome/test/ui/ui_layout_test.h"
-#include "chrome/test/ui/ui_test.h"
-#include "net/base/net_util.h"
-#include "ui/gfx/gl/gl_implementation.h"
-
-class MediaTest : public UITest {
- protected:
-  void PlayMedia(const char* tag, const char* media_file) {
-    FilePath test_file(test_data_directory_);
-    test_file = test_file.AppendASCII("media/player.html");
-
-    GURL player_gurl = net::FilePathToFileURL(test_file);
-    std::string url = base::StringPrintf(
-        "%s?%s=%s", player_gurl.spec().c_str(), tag, media_file);
-
-    NavigateToURL(GURL(url));
-
-    // Allow the media file to be loaded.
-    const std::wstring kPlaying = L"PLAYING";
-    const std::wstring kFailed = L"FAILED";
-    const std::wstring kError = L"ERROR";
-    const base::TimeDelta kSleepInterval =
-        base::TimeDelta::FromMilliseconds(250);
-    const int kNumIntervals =
-        TestTimeouts::action_timeout() / kSleepInterval;
-    for (int i = 0; i < kNumIntervals; ++i) {
-      const std::wstring& title = GetActiveTabTitle();
-      if (title == kPlaying || title == kFailed ||
-          StartsWith(title, kError, true))
-        break;
-      base::PlatformThread::Sleep(kSleepInterval);
-    }
-
-    EXPECT_EQ(kPlaying, GetActiveTabTitle());
-  }
-
-  void PlayAudio(const char* url) {
-    PlayMedia("audio", url);
-  }
-
-  void PlayVideo(const char* url) {
-    PlayMedia("video", url);
-  }
-};
-
-#if defined(OS_MACOSX)
-// http://crbug.com/88834 - VideoBearTheora, VideoBearWav and VideoBearWebm
-// are flaky on Mac.
-#define MAYBE_VideoBearTheora DISABLED_VideoBearTheora
-#define MAYBE_VideoBearWavPcm DISABLED_VideoBearWavPcm
-#define MAYBE_VideoBearWebm DISABLED_VideoBearWebm
-#else
-#define MAYBE_VideoBearTheora VideoBearTheora
-#define MAYBE_VideoBearWavPcm  VideoBearWavPcm
-#define MAYBE_VideoBearWebm VideoBearWebm
-#endif
-
-TEST_F(MediaTest, MAYBE_VideoBearTheora) {
-  PlayVideo("bear.ogv");
-}
-
-TEST_F(MediaTest, VideoBearSilentTheora) {
-  PlayVideo("bear_silent.ogv");
-}
-
-TEST_F(MediaTest, MAYBE_VideoBearWebm) {
-  PlayVideo("bear.webm");
-}
-
-TEST_F(MediaTest, VideoBearSilentWebm) {
-  PlayVideo("bear_silent.webm");
-}
-
-#if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS)
-TEST_F(MediaTest, VideoBearMp4) {
-  PlayVideo("bear.mp4");
-}
-
-TEST_F(MediaTest, VideoBearSilentMp4) {
-  PlayVideo("bear_silent.mp4");
-}
-#endif
-
-#if defined(OS_CHROMEOS)
-#if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS)
-TEST_F(MediaTest, VideoBearAviMp3Mpeg4) {
-  PlayVideo("bear_mpeg4_mp3.avi");
-}
-
-TEST_F(MediaTest, VideoBearAviMp3Divx) {
-  PlayVideo("bear_divx_mp3.avi");
-}
-
-TEST_F(MediaTest, VideoBear3gpAacH264) {
-  PlayVideo("bear_h264_aac.3gp");
-}
-
-TEST_F(MediaTest, VideoBear3gpAmrnbMpeg4) {
-  PlayVideo("bear_mpeg4_amrnb.3gp");
-}
-
-// TODO(ihf): Enable these audio codecs for CrOS.
-// TEST_F(MediaTest, VideoBearWavAlaw) {
-//   PlayVideo("bear_alaw.wav");
-// }
-// TEST_F(MediaTest, VideoBearWavGsmms) {
-//   PlayVideo("bear_gsmms.wav");
-// }
-
-TEST_F(MediaTest, VideoBearWavMulaw) {
-  PlayVideo("bear_mulaw.wav");
-}
-
-TEST_F(MediaTest, VideoBearFlac) {
-  PlayVideo("bear.flac");
-}
-#endif
-#endif
-
-TEST_F(MediaTest, MAYBE_VideoBearWavPcm) {
-  PlayVideo("bear_pcm.wav");
-}
-
-TEST_F(UILayoutTest, MediaUILayoutTest) {
-  static const char* kResources[] = {
-    "content",
-    "media-file.js",
-    "media-fullscreen.js",
-    "video-paint-test.js",
-    "video-played.js",
-    "video-test.js",
-  };
-
-  static const char* kMediaTests[] = {
-    "video-autoplay.html",
-    // "video-loop.html", disabled due to 52887.
-    "video-no-autoplay.html",
-    // TODO(sergeyu): Add more tests here.
-  };
-
-  FilePath test_dir;
-  FilePath media_test_dir;
-  media_test_dir = media_test_dir.AppendASCII("media");
-  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);
-}