[Android] Use isolate remap instead of check.

chrome/unit_tests.isolate

Index: chrome/unit_tests.isolate
diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate
index 82afe34835a1c64c58fc134020539332f8b0be2c..229cb7a3f25f5e7050281851050e1c6cf1c64d16 100644
--- a/chrome/unit_tests.isolate
+++ b/chrome/unit_tests.isolate
@@ -3,36 +3,20 @@
 # found in the LICENSE file.
 {
   'conditions': [
-    ['OS=="linux"', {
+    ['OS=="android" or OS=="linux"', {
       'variables': {
-        'command': [
-          '../testing/xvfb.py',
-          '<(PRODUCT_DIR)',
-          '../tools/swarm_client/run_test_cases.py',
-          '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)',
-        ],
         'isolate_dependency_tracked': [
-          '../testing/xvfb.py',
           '<(PRODUCT_DIR)/chrome.pak',
-          '<(PRODUCT_DIR)/libffmpegsumo.so',
-          '<(PRODUCT_DIR)/locales/fr.pak',
-          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
           '<(PRODUCT_DIR)/test_data/',
         ],
-        'isolate_dependency_touched': [
-          '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so',
-        ],
       },
     }],
-    ['OS=="linux" or OS=="mac" or OS=="win"', {
+    ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'isolate_dependency_tracked': [
-          '../testing/test_env.py',
           '<(PRODUCT_DIR)/resources.pak',
-          '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)',
-          'browser/safe_browsing/two_phase_testserver.py',
         ],
         'isolate_dependency_untracked': [
           '../base/test/data/',
@@ -46,14 +30,13 @@
           '../third_party/pywebsocket/',
           '../third_party/tlslite/',
           '../third_party/zlib/google/test/data/',
-          '../tools/swarm_client/',
           '<(PRODUCT_DIR)/pyproto/',
           'test/data/',
           'third_party/mock4js/',
         ],
       },
     }],
-    ['OS=="linux" or OS=="win"', {
+    ['OS=="android" or OS=="linux" or OS=="win"', {
       'variables': {
         'isolate_dependency_tracked': [
           '<(PRODUCT_DIR)/chrome_100_percent.pak',
@@ -61,6 +44,37 @@
         ],
       },
     }],
+    ['OS=="linux"', {
+      'variables': {
+        'command': [
+          '../testing/xvfb.py',
+          '<(PRODUCT_DIR)',
+          '../tools/swarm_client/run_test_cases.py',
+          '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)',
+        ],
+        'isolate_dependency_tracked': [
+          '../testing/xvfb.py',
+          '<(PRODUCT_DIR)/libffmpegsumo.so',
+          '<(PRODUCT_DIR)/locales/fr.pak',
+          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
+        ],
+        'isolate_dependency_touched': [
+          '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so',
+        ],
+      },
+    }],
+    ['OS=="linux" or OS=="mac" or OS=="win"', {
+      'variables': {
+        'isolate_dependency_tracked': [
+          '../testing/test_env.py',
+          '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)',
+          'browser/safe_browsing/two_phase_testserver.py',
+        ],
+        'isolate_dependency_untracked': [
+          '../tools/swarm_client/',
+        ],
+      },
+    }],
     ['OS=="mac"', {
       'variables': {
         'isolate_dependency_tracked': [