[Android] Convert more test targets to use isolate.

build/android/pylib/browsertests/dispatch.py

 # Copyright (c) 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.
 
 """Dispatches content_browsertests."""
 
 import logging
 import os
 import sys
 
@@ skipping 28 matching lines @@
   # to dispatch any tests.
   if not ports.ResetTestServerPortAllocation():
     raise Exception('Failed to reset test server port.')
 
   test_suite_dir = os.path.join(cmd_helper.OutDirectory.get(),
                                 options.build_type)
   options.test_suite = os.path.join(test_suite_dir,
                                     'apks',
                                     constants.BROWSERTEST_SUITE_NAME + '.apk')
 
+  deps_dir = gtest_dispatch._GenerateDepsDirUsingIsolate(
+      constants.BROWSERTEST_SUITE_NAME, options.build_type)
+
   # Constructs a new TestRunner with the current options.
   def RunnerFactory(device, shard_index):
     return test_runner.TestRunner(
         device,
         options.test_suite,
         options.test_arguments,
         options.timeout,
         options.cleanup_test_files,
         options.tool,
         options.build_type,
         options.webkit,
         options.push_deps,
         constants.BROWSERTEST_TEST_PACKAGE_NAME,
         constants.BROWSERTEST_TEST_ACTIVITY_NAME,
-        constants.BROWSERTEST_COMMAND_LINE_FILE)
+        constants.BROWSERTEST_COMMAND_LINE_FILE,
+        deps_dir=deps_dir)
 
   # Get tests and split them up based on the number of devices.
   all_enabled = gtest_dispatch.GetAllEnabledTests(RunnerFactory,
                                                   attached_devices)
   if options.test_filter:
     all_tests = unittest_util.FilterTestNames(all_enabled,
                                               options.test_filter)
   else:
     all_tests = _FilterTests(all_enabled)
 
@@ skipping 26 matching lines @@
   fixture, case = test.split('.', 1)
   if _StartsWith(fixture, case, 'PRE_'):
     return False
   if _StartsWith(fixture, case, 'MANUAL_'):
     return False
   return True
 
 
 def _StartsWith(a, b, prefix):
   return a.startswith(prefix) or b.startswith(prefix)