Add CrOS specific codecs and media files to ui_tests.

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 "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"
@@ skipping 44 matching lines @@
 };
 
 #if defined(OS_MACOSX)
 // http://crbug.com/88834 - VideoBearTheora, VideoBearWav and VideoBearWebm
 // are flaky on Mac.
 #define MAYBE_VideoBearTheora FLAKY_VideoBearTheora
 #define MAYBE_VideoBearWav FLAKY_VideoBearWav
 #define MAYBE_VideoBearWebm FLAKY_VideoBearWebm
 #else
 #define MAYBE_VideoBearTheora VideoBearTheora
-#define MAYBE_VideoBearWav  VideoBearWav
+#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
 
-TEST_F(MediaTest, MAYBE_VideoBearWav) {
-  PlayVideo("bear.wav");
+#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");
 }
 
 #if defined(OS_MACOSX)
 // http://crbug.com/95274 - MediaUILayoutTest is flaky on Mac.
 #define MAYBE_MediaUILayoutTest FLAKY_MediaUILayoutTest
 #else
 #define MAYBE_MediaUILayoutTest MediaUILayoutTest
 #endif
 
 TEST_F(UILayoutTest, MAYBE_MediaUILayoutTest) {
@@ skipping 19 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);
 }