Android: Also push media files for content_browsertests

build/android/pylib/gtest/test_runner.py

 # 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.
 
 import glob
 import logging
 import os
 
 from pylib import android_commands
 from pylib import constants
@@ skipping 194 matching lines @@
   if test_suite_basename == 'content_browsertests':
     # See http://crbug.com/105104 for why these are needed.
     return [
         'third_party/WebKit/LayoutTests/fast/events',
         'third_party/WebKit/LayoutTests/fast/files',
         'third_party/WebKit/LayoutTests/fast/filesystem',
         'third_party/WebKit/LayoutTests/fast/js/resources',
         'third_party/WebKit/LayoutTests/fast/workers',
         'third_party/WebKit/LayoutTests/http/tests',
         'third_party/WebKit/LayoutTests/storage/indexeddb',
+        'third_party/WebKit/LayoutTests/media',
         'content/test/data/layout_tests/LayoutTests/fast/events',
         'content/test/data/layout_tests/LayoutTests/fast/files',
         'content/test/data/layout_tests/LayoutTests/fast/filesystem',
         'content/test/data/layout_tests/LayoutTests/fast/js/resources',
         'content/test/data/layout_tests/LayoutTests/fast/workers',
         'content/test/data/layout_tests/LayoutTests/http/tests',
         'content/test/data/layout_tests/LayoutTests/storage/indexeddb',
+        'content/test/data/layout_tests/LayoutTests/media',
     ]
   return []
 
 
 def _TestSuiteRequiresMockTestServer(test_suite_basename):
   """Returns True if the test suite requires mock test server."""
   tests_require_net_test_server = ['unit_tests', 'net_unittests',
                                    'content_unittests',
                                    'content_browsertests']
   return (test_suite_basename in
@@ skipping 144 matching lines @@
       self.LaunchChromeTestServerSpawner()
     self.tool.SetupEnvironment()
 
   #override
   def TearDown(self):
     """Cleans up the test enviroment for the test suite."""
     self.tool.CleanUpEnvironment()
     if self._cleanup_test_files:
       self.adb.RemovePushedFiles()
     super(TestRunner, self).TearDown()