Revert of [android] Stop using isolate.py for data dependency management.

build/android/pylib/gtest/gtest_test_instance.py

 # Copyright 2014 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 HTMLParser
 import logging
 import os
 import re
 import tempfile
 import xml.etree.ElementTree
 
 from devil.android import apk_helper
 from pylib import constants
 from pylib.constants import host_paths
 from pylib.base import base_test_result
 from pylib.base import test_instance
+from pylib.utils import isolator
 
 with host_paths.SysPath(host_paths.BUILD_COMMON_PATH):
   import unittest_util # pylint: disable=import-error
 
 
 BROWSER_TEST_SUITES = [
   'components_browsertests',
   'content_browsertests',
 ]
 
@@ skipping 195 matching lines @@
   negative_patterns = ':'.join(l[1:] for l in filter_lines if l[0] == '-')
   if negative_patterns:
     negative_patterns = '-' + negative_patterns
 
   # Join the filter lines into one, big --gtest_filter argument.
   return positive_patterns + negative_patterns
 
 
 class GtestTestInstance(test_instance.TestInstance):
 
-  def __init__(self, args, data_deps_delegate, error_func):
+  def __init__(self, args, isolate_delegate, error_func):
     super(GtestTestInstance, self).__init__()
     # TODO(jbudorick): Support multiple test suites.
     if len(args.suite_name) > 1:
       raise ValueError('Platform mode currently supports only 1 gtest suite')
     self._exe_dist_dir = None
     self._extract_test_list_from_filter = args.extract_test_list_from_filter
     self._shard_timeout = args.shard_timeout
     self._store_tombstones = args.store_tombstones
     self._suite = args.suite_name[0]
 
@@ skipping 36 matching lines @@
 
     self._data_deps = []
     if args.test_filter:
       self._gtest_filter = args.test_filter
     elif args.test_filter_file:
       with open(args.test_filter_file, 'r') as f:
         self._gtest_filter = ConvertTestFilterFileIntoGTestFilterArgument(f)
     else:
       self._gtest_filter = None
 
-    self._data_deps_delegate = data_deps_delegate
-    self._runtime_deps_path = args.runtime_deps_path
-    if not self._runtime_deps_path:
-      logging.warning('No data dependencies will be pushed.')
+    if (args.isolate_file_path and
+        not isolator.IsIsolateEmpty(args.isolate_file_path)):
+      self._isolate_abs_path = os.path.abspath(args.isolate_file_path)
+      self._isolate_delegate = isolate_delegate
+      self._isolated_abs_path = os.path.join(
+          constants.GetOutDirectory(), '%s.isolated' % self._suite)
+    else:
+      logging.warning('%s isolate file provided. No data deps will be pushed.',
+                      'Empty' if args.isolate_file_path else 'No')
+      self._isolate_delegate = None
 
     if args.app_data_files:
       self._app_data_files = args.app_data_files
       if args.app_data_file_dir:
         self._app_data_file_dir = args.app_data_file_dir
       else:
         self._app_data_file_dir = tempfile.mkdtemp()
         logging.critical('Saving app files to %s', self._app_data_file_dir)
     else:
       self._app_data_files = None
@@ skipping 76 matching lines @@
   def extract_test_list_from_filter(self):
     return self._extract_test_list_from_filter
 
   #override
   def TestType(self):
     return 'gtest'
 
   #override
   def SetUp(self):
     """Map data dependencies via isolate."""
-    self._data_deps.extend(
-        self._data_deps_delegate(self._runtime_deps_path))
+    if self._isolate_delegate:
+      self._isolate_delegate.Remap(
+          self._isolate_abs_path, self._isolated_abs_path)
+      self._isolate_delegate.PurgeExcluded(_DEPS_EXCLUSION_LIST)
+      self._isolate_delegate.MoveOutputDeps()
+      dest_dir = None
+      self._data_deps.extend([
+          (self._isolate_delegate.isolate_deps_dir, dest_dir)])
+
 
   def GetDataDependencies(self):
     """Returns the test suite's data dependencies.
 
     Returns:
       A list of (host_path, device_path) tuples to push. If device_path is
       None, the client is responsible for determining where to push the file.
     """
     return self._data_deps
 
@@ skipping 33 matching lines @@
     if disabled_tests_file_path and os.path.exists(disabled_tests_file_path):
       with open(disabled_tests_file_path) as disabled_tests_file:
         disabled_filter_items += [
             '%s' % l for l in (line.strip() for line in disabled_tests_file)
             if l and not l.startswith('#')]
 
     return '*-%s' % ':'.join(disabled_filter_items)
 
   #override
   def TearDown(self):
-    """Do nothing."""
-    pass
+    """Clear the mappings created by SetUp."""
+    if self._isolate_delegate:
+      self._isolate_delegate.Clear()