Refactor/cleanup WebRTC-specific Andorid glue code.

build/android/pylib/gtest/setup.py

 # Copyright 2013 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.
 
 """Generates test runner factory and tests for GTests."""
 # pylint: disable=W0212
 
 import fnmatch
 import glob
 import logging
@@ skipping 28 matching lines @@
     'media_perftests': 'media/media_perftests.isolate',
     'media_unittests': 'media/media_unittests.isolate',
     'net_unittests': 'net/net_unittests.isolate',
     'sql_unittests': 'sql/sql_unittests.isolate',
     'ui_unittests': 'ui/ui_unittests.isolate',
     'unit_tests': 'chrome/unit_tests.isolate',
     'webkit_unit_tests':
       'third_party/WebKit/Source/web/WebKitUnitTests.isolate',
 }
 
-# Paths relative to third_party/webrtc/ (kept separate for readability).
-_WEBRTC_ISOLATE_FILE_PATHS = {
-    'audio_decoder_unittests':
-      'modules/audio_coding/neteq/audio_decoder_unittests.isolate',
-    'common_audio_unittests': 'common_audio/common_audio_unittests.isolate',
-    'common_video_unittests': 'common_video/common_video_unittests.isolate',
-    'modules_tests': 'modules/modules_tests.isolate',
-    'modules_unittests': 'modules/modules_unittests.isolate',
-    'system_wrappers_unittests':
-      'system_wrappers/source/system_wrappers_unittests.isolate',
-    'test_support_unittests': 'test/test_support_unittests.isolate',
-    'tools_unittests': 'tools/tools_unittests.isolate',
-    'video_engine_tests': 'video_engine_tests.isolate',
-    'video_engine_core_unittests':
-      'video_engine/video_engine_core_unittests.isolate',
-    'voice_engine_unittests': 'voice_engine/voice_engine_unittests.isolate',
-    'webrtc_perf_tests': 'webrtc_perf_tests.isolate',
-}
-
-# Append the WebRTC tests with the full path from Chromium's src/ root.
-for webrtc_test, isolate_path in _WEBRTC_ISOLATE_FILE_PATHS.items():
-  _ISOLATE_FILE_PATHS[webrtc_test] = 'third_party/webrtc/%s' % isolate_path
-
 # Used for filtering large data deps at a finer grain than what's allowed in
 # isolate files since pushing deps to devices is expensive.
 # Wildcards are allowed.
 _DEPS_EXCLUSION_LIST = [
     'chrome/test/data/extensions/api_test',
     'chrome/test/data/extensions/secure_shell',
     'chrome/test/data/firefox*',
     'chrome/test/data/gpu',
     'chrome/test/data/image_decoding',
     'chrome/test/data/import',
@@ skipping 32 matching lines @@
                                       isolate_file_path)
   else:
     isolate_rel_path = _ISOLATE_FILE_PATHS.get(suite_name)
     if not isolate_rel_path:
       logging.info('Did not find an isolate file for the test suite.')
       return
     isolate_abs_path = os.path.join(constants.DIR_SOURCE_ROOT, isolate_rel_path)
 
   isolated_abs_path = os.path.join(
       constants.GetOutDirectory(), '%s.isolated' % suite_name)
-  assert os.path.exists(isolate_abs_path)
+  assert os.path.exists(isolate_abs_path), 'Cannot find %s' % isolate_abs_path
   # This needs to be kept in sync with the cmd line options for isolate.py
   # in src/build/isolate.gypi.
   isolate_cmd = [
       'python', _ISOLATE_SCRIPT,
       'remap',
       '--isolate', isolate_abs_path,
       '--isolated', isolated_abs_path,
       '--outdir', constants.ISOLATE_DEPS_DIR,
 
       '--path-variable', 'DEPTH', constants.DIR_SOURCE_ROOT,
@@ skipping 212 matching lines @@
   if test_options.gtest_filter:
     tests = unittest_util.FilterTestNames(tests, test_options.gtest_filter)
 
   # Coalesce unit tests into a single test per device
   if test_options.suite_name != 'content_browsertests':
     num_devices = len(devices)
     tests = [':'.join(tests[i::num_devices]) for i in xrange(num_devices)]
     tests = [t for t in tests if t]
 
   return (TestRunnerFactory, tests)