[Android] Partial revert of r209283.

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
 import sys
 
 from pylib import android_commands
 from pylib import cmd_helper
 from pylib import constants
 from pylib import perf_tests_helper
 from pylib.android_commands import errors
 from pylib.base import base_test_result
 from pylib.base import base_test_runner
 from pylib.utils import run_tests_helper
 
 import test_package_apk
 import test_package_executable
 
 sys.path.insert(
     0, os.path.join(constants.DIR_SOURCE_ROOT, 'tools', 'swarm_client'))
 import run_isolated
 
 
 _ISOLATE_FILE_PATHS = {
-  'base_unittests': 'base/base_unittests.isolate',
+  #'base_unittests': 'base/base_unittests.isolate',
   #'net_unittests': 'net/net_unittests.isolate',
   #'unit_tests': 'chrome/unit_tests.isolate',
   #'content_browsertests': 'content/content_browsertests.isolate',
   #'content_unittests': 'content/content_unittests.isolate',
   }
 _ISOLATE_SCRIPT = os.path.join(
     constants.DIR_SOURCE_ROOT, 'tools', 'swarm_client', 'isolate.py')
 
 
 def _GetDataFilesForTestSuite(product_dir, test_suite_basename):
@@ skipping 28 matching lines @@
     with open(isolated_abs_path) as f:
       isolated_content = run_isolated.load_isolated(f.read(),
                                                     os_flavor='android')
       assert isolated_content['os'] == 'android'
       return isolated_content['files'].keys()
 
   logging.info('Did not find an isolate file for the test suite.')
   # Ideally, we'd just push all test data. However, it has >100MB, and a lot
   # of the files are not relevant (some are used for browser_tests, others for
   # features not supported, etc..).
-  if test_suite_basename == 'unit_tests':
+  if test_suite_basename == 'base_unittests':
+    return [
+        'base/test/data/',
+    ]
+  elif test_suite_basename == 'unit_tests':
     test_files = [
         'base/test/data/',
         'chrome/test/data/download-test1.lib',
         'chrome/test/data/extensions/bad_magic.crx',
         'chrome/test/data/extensions/good.crx',
         'chrome/test/data/extensions/icon1.png',
         'chrome/test/data/extensions/icon2.png',
         'chrome/test/data/extensions/icon3.png',
         'chrome/test/data/extensions/allow_silent_upgrade/',
         'chrome/test/data/extensions/app/',
@@ skipping 296 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()