Run media_unittests on android test bots.

BUG=137131

TEST=


Review URL: https://chromiumcodereview.appspot.com/10808115

git-svn-id: http://src.chromium.org/svn/trunk/src/build@148493 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

all_android.gyp

@@ -63,10 +63,11 @@
             '../content/content.gyp:content_unittests_apk',
             '../chrome/chrome.gyp:unit_tests_apk',
             '../gpu/gpu.gyp:gpu_unittests_apk',
+            '../ipc/ipc.gyp:ipc_tests_apk',
+            '../media/media.gyp:media_unittests_apk',
+            '../net/net.gyp:net_unittests_apk',
             '../sql/sql.gyp:sql_unittests_apk',
             '../sync/sync.gyp:sync_unit_tests_apk',
-            '../ipc/ipc.gyp:ipc_tests_apk',
-            '../net/net.gyp:net_unittests_apk',
             '../ui/ui.gyp:ui_unittests_apk',
           ],
         }]

android/gtest_filter/media_unittests_disabled

@@ -0,0 +1,16 @@
+# List of suppressions
+
+# crbug.com/138848
+AudioOutputControllerTest.CreateAndClose
+AudioOutputControllerTest.PlayPauseClose
+AudioOutputControllerTest.PlayPausePlayClose
+
+# crbug.com/136720
+CrossProcessNotificationMultiProcessTest.Basic
+
+# Death tests are not supported on APK
+# http://crbug.com/138855
+CompositeFilterDeathTest.*
+
+# http://crbug.com/138833
+AesDecryptorTest.*

android/run_tests.py

@@ -73,6 +73,7 @@ _TEST_SUITES = ['base_unittests',
                 'content_unittests',
                 'gpu_unittests',
                 'ipc_tests',
+                'media_unittests',
                 'net_unittests',
                 'sql_unittests',
                 'sync_unit_tests',