Revert of Enable media browsertests on Android

content/browser/media/media_browsertest.cc

Index: content/browser/media/media_browsertest.cc
diff --git a/content/browser/media/media_browsertest.cc b/content/browser/media/media_browsertest.cc
index f7237c6078a0fe87a433167f2265fbaf02b795db..826a072ca8bc3b3cd04b83664486b88c1a6a2e56 100644
--- a/content/browser/media/media_browsertest.cc
+++ b/content/browser/media/media_browsertest.cc
@@ -101,8 +101,6 @@
   }
 };
 
-// Android doesn't support Theora.
-#if !defined(OS_ANDROID)
 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearTheora) {
   PlayVideo("bear.ogv", GetParam());
 }
@@ -110,7 +108,6 @@
 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearSilentTheora) {
   PlayVideo("bear_silent.ogv", GetParam());
 }
-#endif  // !defined(OS_ANDROID)
 
 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWebm) {
   PlayVideo("bear.webm", GetParam());
@@ -139,12 +136,9 @@
   PlayVideo("bear.mp4", GetParam());
 }
 
-// Android devices usually only support baseline, main and high.
-#if !defined(OS_ANDROID)
 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearHighBitDepthMp4) {
   PlayVideo("bear-320x180-hi10p.mp4", GetParam());
 }
-#endif  // !defined(OS_ANDROID)
 
 // Crashes on Mac only.  http://crbug.com/621857
 #if defined(OS_MACOSX)
@@ -243,7 +237,7 @@
 
 // Covers tear-down when navigating away as opposed to browser exiting.
 IN_PROC_BROWSER_TEST_F(MediaTest, Navigate) {
-  PlayVideo("bear.webm", false);
+  PlayVideo("bear.ogv", false);
   NavigateToURL(shell(), GURL(url::kAboutBlankURL));
   EXPECT_FALSE(shell()->web_contents()->IsCrashed());
 }