[Android] Convert more test targets to use isolate.

BUG=249870
TBR=ben@chromium.org, acolwell@chromium.org, joi@chromium.org, enne@chromium.org, mark@chromium.org, jam@chromium.org

Review URL: https://chromiumcodereview.appspot.com/19040002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211547 0039d316-1c4b-4281-b951-d872f2087c98

17 files changed, 196 insertions, 174 deletions

diff --git a/breakpad/OWNERS b/breakpad/OWNERS
index d38d4ab..4289d68 100644
--- a/breakpad/OWNERS
+++ b/breakpad/OWNERS
@@ -1,2 +1,5 @@
 mark@chromium.org
 thestig@chromium.org
+
+per-file *.isolate=csharp@chromium.org
+per-file *.isolate=maruel@chromium.org
diff --git a/breakpad/breakpad_unittests.isolate b/breakpad/breakpad_unittests.isolate
new file mode 100644
index 0000000..6334b39
--- /dev/null
+++ b/breakpad/breakpad_unittests.isolate
@@ -0,0 +1,14 @@
+# 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.
+{
+  'conditions': [
+    ['OS=="android"', {
+      'variables': {
+        'isolate_dependency_tracked': [
+          '<(PRODUCT_DIR)/linux_dumper_unittest_helper',
+        ],
+      },
+    }],
+  ],
+}
diff --git a/build/android/pylib/browsertests/dispatch.py b/build/android/pylib/browsertests/dispatch.py
index 1c8cfb4..a0e49c9 100644
--- a/build/android/pylib/browsertests/dispatch.py
+++ b/build/android/pylib/browsertests/dispatch.py
@@ -55,6 +55,9 @@ def Dispatch(options):
                                     '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(
@@ -69,7 +72,8 @@ def Dispatch(options):
         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,
diff --git a/build/android/pylib/gtest/dispatch.py b/build/android/pylib/gtest/dispatch.py
index 3dfb262..fb1b799 100644
--- a/build/android/pylib/gtest/dispatch.py
+++ b/build/android/pylib/gtest/dispatch.py
@@ -29,6 +29,14 @@ import test_runner
 # blow up the dependency size (and the world).
 _ISOLATE_FILE_PATHS = {
     'base_unittests': 'base/base_unittests.isolate',
+    'breakpad_unittests': 'breakpad/breakpad_unittests.isolate',
+    'cc_perftests': 'cc/cc_perftests.isolate',
+    'components_unittests': 'components/components_unittests.isolate',
+    'content_browsertests': 'content/content_browsertests.isolate',
+    'content_unittests': 'content/content_unittests.isolate',
+    'media_unittests': 'media/media_unittests.isolate',
+    'net_unittests': 'net/net_unittests.isolate',
+    'ui_unittests': 'ui/ui_unittests.isolate',
     'unit_tests': 'chrome/unit_tests.isolate',
 }
 
@@ -49,6 +57,9 @@ _DEPS_EXCLUSION_LIST = [
     'chrome/test/data/scroll',
     'chrome/test/data/third_party',
     'third_party/hunspell_dictionaries/*.dic',
+    # crbug.com/258690
+    'webkit/data/bmp_decoder',
+    'webkit/data/ico_decoder',
 ]
 
 _ISOLATE_SCRIPT = os.path.join(
diff --git a/build/android/pylib/gtest/test_package.py b/build/android/pylib/gtest/test_package.py
index f903e52..3ad6df6 100644
--- a/build/android/pylib/gtest/test_package.py
+++ b/build/android/pylib/gtest/test_package.py
@@ -87,30 +87,6 @@ class TestPackage(object):
         ret += [current + test_name]
     return ret
 
-  def PushDataAndPakFiles(self):
-    external_storage = self.adb.GetExternalStorage()
-    if (self.test_suite_basename == 'ui_unittests'):
-      self.adb.PushIfNeeded(
-          self.test_suite_dirname + '/chrome.pak',
-          external_storage + '/paks/chrome.pak')
-      self.adb.PushIfNeeded(
-          self.test_suite_dirname + '/locales/en-US.pak',
-          external_storage + '/paks/en-US.pak')
-    if self.test_suite_basename in ('content_unittests',
-                                    'components_unittests'):
-      self.adb.PushIfNeeded(
-          self.test_suite_dirname + '/content_resources.pak',
-          external_storage + '/paks/content_resources.pak')
-    if self.test_suite_basename == 'breakpad_unittests':
-      self.adb.PushIfNeeded(
-          self.test_suite_dirname + '/linux_dumper_unittest_helper',
-          constants.TEST_EXECUTABLE_DIR + '/linux_dumper_unittest_helper')
-    if self.test_suite_basename == 'content_browsertests':
-      self.adb.PushIfNeeded(
-          self.test_suite_dirname +
-          '/../content_shell/assets/content_shell.pak',
-          external_storage + '/paks/content_shell.pak')
-
   def _WatchTestOutput(self, p):
     """Watches the test output.
 
diff --git a/build/android/pylib/gtest/test_runner.py b/build/android/pylib/gtest/test_runner.py
index 4efb9ae..c1343a4 100644
--- a/build/android/pylib/gtest/test_runner.py
+++ b/build/android/pylib/gtest/test_runner.py
@@ -30,110 +30,7 @@ def _GetDataFilesForTestSuite(test_suite_basename):
   # 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 == 'media_unittests':
-    return [
-        'media/test/data',
-    ]
-  elif test_suite_basename == 'net_unittests':
-    return [
-        'chrome/test/data/animate1.gif',
-        'chrome/test/data/simple.html',
-        'net/data/cache_tests',
-        'net/data/filter_unittests',
-        'net/data/ftp',
-        'net/data/proxy_resolver_v8_tracing_unittest',
-        'net/data/proxy_resolver_v8_unittest',
-        'net/data/proxy_script_fetcher_unittest',
-        'net/data/ssl/certificates',
-        'net/data/test.html',
-        'net/data/url_request_unittest/',
-        ]
-  elif test_suite_basename == 'ui_unittests':
-    return [
-        'ui/base/test/data/data_pack_unittest/truncated-header.pak',
-    ]
-  elif test_suite_basename == 'content_unittests':
-    return [
-        'content/test/data/gpu/webgl_conformance_test_expectations.txt',
-        'content/test/data/page_state/',
-        'net/data/ssl/certificates/',
-        'third_party/hyphen/hyph_en_US.dic',
-        'webkit/data/dom_storage/webcore_test_database.localstorage',
-        ]
-  elif test_suite_basename == 'cc_perftests':
-    return [
-      'cc/test/data',
-    ]
-  elif test_suite_basename == 'content_browsertests':
-    return [
-        'content/test/data/content-disposition-inline.html',
-        'content/test/data/title1.html',
-        'content/test/data/post_message2.html',
-        'content/test/data/content-sniffer-test0.html.mock-http-headers',
-        'content/test/data/content-sniffer-test1.html.mock-http-headers',
-        'content/test/data/speech',
-        'content/test/data/page404.html.mock-http-headers',
-        'content/test/data/content-sniffer-test3.html',
-        'content/test/data/post_message.html',
-        'content/test/data/remove_frame_on_unload.html',
-        'content/test/data/cross-origin-redirect-blocked.html',
-        'content/test/data/prerender',
-        'content/test/data/device_orientation',
-        'content/test/data/content-disposition-empty.html',
-        'content/test/data/workers',
-        'content/test/data/content-sniffer-test3.html.mock-http-headers',
-        'content/test/data/content-sniffer-test0.html',
-        'content/test/data/browser_plugin_title_change.html',
-        'content/test/data/android',
-        'content/test/data/page404.html',
-        'content/test/data/dynamic2.html',
-        'content/test/data/browser_plugin_embedder.html',
-        'content/test/data/indexeddb',
-        'content/test/data/content-disposition-inline.html.mock-http-headers',
-        'content/test/data/nosniff-test.html',
-        'content/test/data/title3.html',
-        'content/test/data/browser_plugin_post_message_guest.html',
-        'content/test/data/content-disposition-empty.html.mock-http-headers',
-        'content/test/data/session_history',
-        'content/test/data/browser_plugin_embedder.html',
-        'content/test/data/overscroll_navigation.html',
-        'content/test/data/simple_database.html',
-        'content/test/data/gtk_key_bindings_test_gtkrc',
-        'content/test/data/browser_plugin_embedder_guest_unresponsive.html',
-        'content/test/data/sync_xmlhttprequest.html',
-        'content/test/data/content-sniffer-test3-frame.txt.mock-http-headers',
-        'content/test/data/frame_tree',
-        'content/test/data/content-sniffer-test2.html.mock-http-headers',
-        'content/test/data/sync_xmlhttprequest_disallowed.html',
-        'content/test/data/rwh_simple.html',
-        'content/test/data/title2.html',
-        'content/test/data/webkit',
-        'content/test/data/content-sniffer-test1.html',
-        'content/test/data/download',
-        'content/test/data/content-sniffer-test2.html',
-        'content/test/data/simple_page.html',
-        'content/test/data/google.mht',
-        'content/test/data/site_per_process_main.html',
-        'content/test/data/gpu',
-        'content/test/data/onunload_cookie.html',
-        'content/test/data/textinput',
-        'content/test/data/navigate_opener.html',
-        'content/test/data/dom_storage',
-        'content/test/data/sync_xmlhttprequest_during_unload.html',
-        'content/test/data/browser_plugin_dragging.html',
-        'content/test/data/fileapi',
-        'content/test/data/npapi',
-        'content/test/data/nosniff-test.html.mock-http-headers',
-        'content/test/data/accessibility',
-        'content/test/data/dynamic1.html',
-        'content/test/data/browser_plugin_focus_child.html',
-        'content/test/data/rwhv_compositing_animation.html',
-        'content/test/data/click-noreferrer-links.html',
-        'content/test/data/browser_plugin_focus.html',
-        'content/test/data/media',
-        'third_party/webgl_conformance',
-    ]
-  elif test_suite_basename == 'modules_unittests':
+  if test_suite_basename == 'modules_unittests':
     return [
         'resources',
         'data',
@@ -213,7 +110,6 @@ class TestRunner(base_test_runner.BaseTestRunner):
   #override
   def PushDataDeps(self):
     self.adb.WaitForSdCardReady(20)
-    self.test_package.PushDataAndPakFiles()
     self.tool.CopyFiles()
     if self.test_package.test_suite_basename == 'webkit_unit_tests':
       self.PushWebKitUnitTestsData()
@@ -227,10 +123,15 @@ class TestRunner(base_test_runner.BaseTestRunner):
             os.path.join(self.adb.GetExternalStorage(), p))
       return
 
+    device_dir = self.adb.GetExternalStorage()
+    # TODO(frankf): linux_dumper_unittest_helper needs to be in the same dir
+    # as breakpad_unittests exe. Find a better way to do this.
+    if self.test_package.test_suite_basename == 'breakpad_unittests':
+      device_dir = constants.TEST_EXECUTABLE_DIR
     for p in os.listdir(self._deps_dir):
       self.adb.PushIfNeeded(
           os.path.join(self._deps_dir, p),
-          os.path.join(self.adb.GetExternalStorage(), p))
+          os.path.join(device_dir, p))
 
   def PushWebKitUnitTestsData(self):
     """Pushes the webkit_unit_tests data files to the device.
diff --git a/cc/OWNERS b/cc/OWNERS
index 2e33090..e90c2f3 100644
--- a/cc/OWNERS
+++ b/cc/OWNERS
@@ -39,3 +39,6 @@ enne@chromium.org
 
 # animation
 vollick@chromium.org
+
+per-file *.isolate=csharp@chromium.org
+per-file *.isolate=maruel@chromium.org
diff --git a/cc/cc_perftests.isolate b/cc/cc_perftests.isolate
new file mode 100644
index 0000000..0aa38c0
--- /dev/null
+++ b/cc/cc_perftests.isolate
@@ -0,0 +1,14 @@
+# 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.
+{
+  'conditions': [
+    ['OS=="android"', {
+      'variables': {
+        'isolate_dependency_untracked': [
+          'test/data/',
+        ],
+      },
+    }],
+  ],
+}
diff --git a/components/OWNERS b/components/OWNERS
index 2bdde1e..40c1c31 100644
--- a/components/OWNERS
+++ b/components/OWNERS
@@ -21,3 +21,6 @@ per-file user_prefs.gypi=battre@chromium.org
 per-file user_prefs.gypi=bauerb@chromium.org
 per-file user_prefs.gypi=mnissler@chromium.org
 per-file user_prefs.gypi=pam@chromium.org
+
+per-file *.isolate=csharp@chromium.org
+per-file *.isolate=maruel@chromium.org
diff --git a/components/components_unittests.isolate b/components/components_unittests.isolate
new file mode 100644
index 0000000..0c18d8f
--- /dev/null
+++ b/components/components_unittests.isolate
@@ -0,0 +1,14 @@
+# 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.
+{
+  'conditions': [
+    ['OS=="android"', {
+      'variables': {
+        'isolate_dependency_tracked': [
+          '<(PRODUCT_DIR)/content_resources.pak',
+        ],
+      },
+    }],
+  ],
+}
diff --git a/content/content_browsertests.isolate b/content/content_browsertests.isolate
index 2ed7523..4c31a24 100644
--- a/content/content_browsertests.isolate
+++ b/content/content_browsertests.isolate
@@ -2,22 +2,25 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
-  'variables': {
-    'isolate_dependency_tracked': [
-      '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)',
-    ],
-    'isolate_dependency_untracked': [
-      'test/data/',
-      '../net/data/',
-      '../net/tools/testserver/',
-      '../third_party/lighttpd/',
-      '../third_party/pyftpdlib/',
-      '../third_party/pywebsocket/',
-      '../third_party/tlslite/',
-      '../third_party/WebKit/Tools/Scripts/',
-    ],
-  },
   'conditions': [
+    ['OS=="android"', {
+      'variables': {
+        'isolate_dependency_tracked': [
+          '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak',
+        ],
+        'isolate_dependency_untracked': [
+          '../third_party/webgl_conformance/',
+        ],
+      },
+    }],
+    ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
+      'variables': {
+        'isolate_dependency_untracked': [
+          '../net/data/',
+          'test/data/',
+        ],
+      },
+    }],
     ['OS=="linux"', {
       'variables': {
         'command': [
@@ -32,29 +35,46 @@
           '<(PRODUCT_DIR)/libclearkeycdm.so',
           '<(PRODUCT_DIR)/libclearkeycdmadapter.so',
           '<(PRODUCT_DIR)/libffmpegsumo.so',
-          '<(PRODUCT_DIR)/plugins/libnpapi_test_plugin.so',
           '<(PRODUCT_DIR)/plugins/libTestNetscapePlugin.so',
+          '<(PRODUCT_DIR)/plugins/libnpapi_test_plugin.so',
         ],
       },
     }],
-    ['OS=="mac" or OS=="win"', {
+    ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
-        'command': [
-          '../testing/test_env.py',
-          '../tools/swarm_client/run_test_cases.py',
+        'isolate_dependency_tracked': [
           '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)',
         ],
+        'isolate_dependency_untracked': [
+          '../net/tools/testserver/',
+          '../third_party/WebKit/Tools/Scripts/',
+          '../third_party/lighttpd/',
+          '../third_party/pyftpdlib/',
+          '../third_party/pywebsocket/',
+          '../third_party/tlslite/',
+        ],
       },
     }],
     ['OS=="mac"', {
       'variables': {
-        'isolate_dependency_untracked': [
+        'isolate_dependency_tracked': [
           '<(PRODUCT_DIR)/clearkeycdmadapter.plugin',
           '<(PRODUCT_DIR)/content_resources.pak',
-          '<(PRODUCT_DIR)/Content Shell.app/',
           '<(PRODUCT_DIR)/ffmpegsumo.so',
-          '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin',
           '<(PRODUCT_DIR)/plugins/TestNestscapePlugin.plugin',
+          '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin',
+        ],
+        'isolate_dependency_untracked': [
+          '<(PRODUCT_DIR)/Content Shell.app/',
+        ],
+      },
+    }],
+    ['OS=="mac" or OS=="win"', {
+      'variables': {
+        'command': [
+          '../testing/test_env.py',
+          '../tools/swarm_client/run_test_cases.py',
+          '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
@@ -62,6 +82,12 @@
       'variables': {
         'isolate_dependency_tracked': [
           '<(PRODUCT_DIR)/ffmpegsumo.dll',
+          '<(PRODUCT_DIR)/chrome_100_percent.pak',
+          '<(PRODUCT_DIR)/clearkeycdm.dll',
+          '<(PRODUCT_DIR)/clearkeycdmadapter.dll',
+          '<(PRODUCT_DIR)/content_shell.pak',
+          '<(PRODUCT_DIR)/plugins/npTestNetscapePlugIn.dll',
+          '<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll',
         ],
         'isolate_dependency_untracked': [
           # The two directories below are only needed for
@@ -69,12 +95,6 @@
           #'../third_party/cygwin/',
           #'../third_party/perl/perl/',
           '../third_party/python_26/',
-          '<(PRODUCT_DIR)/chrome_100_percent.pak',
-          '<(PRODUCT_DIR)/clearkeycdm.dll',
-          '<(PRODUCT_DIR)/clearkeycdmadapter.dll',
-          '<(PRODUCT_DIR)/content_shell.pak',
-          '<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll',
-          '<(PRODUCT_DIR)/plugins/npTestNetscapePlugIn.dll',
         ],
       },
     }],
diff --git a/content/content_unittests.isolate b/content/content_unittests.isolate
index 9689f02..a3bd8e8 100644
--- a/content/content_unittests.isolate
+++ b/content/content_unittests.isolate
@@ -3,6 +3,25 @@
 # found in the LICENSE file.
 {
   'conditions': [
+    ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
+      'variables': {
+        'isolate_dependency_tracked': [
+          '../third_party/hyphen/hyph_en_US.dic',
+        ],
+        'isolate_dependency_untracked': [
+          '../media/test/data/',
+          '../webkit/data/',
+          'test/data/',
+        ],
+      },
+    }],
+    ['OS=="android" or OS=="mac"', {
+      'variables': {
+        'isolate_dependency_tracked': [
+          '<(PRODUCT_DIR)/content_resources.pak',
+        ],
+      },
+    }],
     ['OS=="linux"', {
       'variables': {
         'command': [
@@ -11,8 +30,10 @@
           '../tools/swarm_client/run_test_cases.py',
           '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)',
         ],
-        'isolate_dependency_untracked': [
+        'isolate_dependency_tracked': [
           '<(PRODUCT_DIR)/libffmpegsumo.so',
+        ],
+        'isolate_dependency_untracked': [
           '<(PRODUCT_DIR)/test_data/',
         ],
       },
@@ -22,17 +43,11 @@
         'isolate_dependency_tracked': [
           '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)',
         ],
-        'isolate_dependency_untracked': [
-          '../third_party/hyphen/hyph_en_US.dic',
-          '../webkit/data/',
-          'test/data/',
-        ],
       },
     }],
     ['OS=="mac"', {
       'variables': {
-        'isolate_dependency_untracked': [
-          '<(PRODUCT_DIR)/content_resources.pak',
+        'isolate_dependency_tracked': [
           '<(PRODUCT_DIR)/ffmpegsumo.so',
         ],
       },
@@ -48,7 +63,7 @@
     }],
     ['OS=="win"', {
       'variables': {
-        'isolate_dependency_untracked': [
+        'isolate_dependency_tracked': [
           '<(PRODUCT_DIR)/ffmpegsumo.dll',
           '<(PRODUCT_DIR)/icudt.dll',
         ],
diff --git a/media/OWNERS b/media/OWNERS
index ee59834..eeb9125 100644
--- a/media/OWNERS
+++ b/media/OWNERS
@@ -6,3 +6,6 @@ scherkus@chromium.org
 shadi@chromium.org
 vrk@chromium.org
 xhwang@chromium.org
+
+per-file *.isolate=csharp@chromium.org
+per-file *.isolate=maruel@chromium.org
diff --git a/media/media_unittests.isolate b/media/media_unittests.isolate
new file mode 100644
index 0000000..0aa38c0
--- /dev/null
+++ b/media/media_unittests.isolate
@@ -0,0 +1,14 @@
+# 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.
+{
+  'conditions': [
+    ['OS=="android"', {
+      'variables': {
+        'isolate_dependency_untracked': [
+          'test/data/',
+        ],
+      },
+    }],
+  ],
+}
diff --git a/net/net_unittests.isolate b/net/net_unittests.isolate
index a54c3f4..06bd41b 100644
--- a/net/net_unittests.isolate
+++ b/net/net_unittests.isolate
@@ -3,6 +3,19 @@
 # found in the LICENSE file.
 {
   'conditions': [
+    ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
+      'variables': {
+        'isolate_dependency_tracked': [
+          '../chrome/test/data/animate1.gif',
+          '../chrome/test/data/server-unavailable.html',
+          '../chrome/test/data/server-unavailable.html.mock-http-headers',
+          '../chrome/test/data/simple.html',
+        ],
+        'isolate_dependency_untracked': [
+          'data/',
+        ],
+      },
+    }],
     ['OS=="linux"', {
       'variables': {
         'command': [
@@ -20,10 +33,6 @@
     ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'isolate_dependency_tracked': [
-          '../chrome/test/data/animate1.gif',
-          '../chrome/test/data/server-unavailable.html',
-          '../chrome/test/data/server-unavailable.html.mock-http-headers',
-          '../chrome/test/data/simple.html',
           '../testing/test_env.py',
           '../tools/swarm_client/run_isolated.py',
           '../tools/swarm_client/run_test_cases.py',
@@ -34,7 +43,6 @@
           '../third_party/pywebsocket/',
           '../third_party/tlslite/',
           '<(PRODUCT_DIR)/pyproto/',
-          'data/',
           'tools/testserver/',
         ],
       },
diff --git a/ui/OWNERS b/ui/OWNERS
index 442cf46..80dbf7d 100644
--- a/ui/OWNERS
+++ b/ui/OWNERS
@@ -3,3 +3,6 @@ sky@chromium.org
 
 # Mac stuff
 thakis@chromium.org
+
+per-file *.isolate=csharp@chromium.org
+per-file *.isolate=maruel@chromium.org
diff --git a/ui/ui_unittests.isolate b/ui/ui_unittests.isolate
new file mode 100644
index 0000000..35f732b
--- /dev/null
+++ b/ui/ui_unittests.isolate
@@ -0,0 +1,16 @@
+# 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.
+{
+  'conditions': [
+    ['OS=="android"', {
+      'variables': {
+        'isolate_dependency_tracked': [
+          'base/test/data/data_pack_unittest/truncated-header.pak',
+          '<(PRODUCT_DIR)/chrome.pak',
+          '<(PRODUCT_DIR)/locales/en-US.pak',
+        ],
+      },
+    }],
+  ],
+}