Update unit test file format.

mojo/tools/data/unittests

Index: mojo/tools/data/unittests
diff --git a/mojo/tools/data/unittests b/mojo/tools/data/unittests
index 1b178ba0f9fe6c554fb0036815c54174a5c9d293..b575d83d5b0b1c735bbc4df44cc4724d79d0bbd0 100644
--- a/mojo/tools/data/unittests
+++ b/mojo/tools/data/unittests
@@ -1,33 +1,75 @@
 # This file contains a list of Mojo gtest unit tests.
-# Prepend * to indicate that results shouldn't be cached (e.g., if the test has
-# other data dependencies).
-# TODO(vtl): Add a way of specifying data dependencies instead.
+# TODO(vtl): Add a way of specifying data dependencies instead of cacheable.
+[
+  # System tests:

[viettrungluu, 2014/12/03 16:15:37]

This is obviously not JSON. What is it?

+  {
+    "test": "mojo_system_unittests",
+    "run_on_android": true
+  },
 
-# System tests:
-mojo_system_unittests
+  # Public tests:
+  {
+    "test": "mojo_public_bindings_unittests",
+    "cacheable": false
+  },
+  {
+    "test": "mojo_public_environment_unittests"
+  },
+  {
+    "test": "mojo_public_system_unittests"
+  },
+  {
+    "test": "mojo_public_utility_unittests"
+  },
 
-# Public tests:
-*mojo_public_bindings_unittests
-mojo_public_environment_unittests
-mojo_public_system_unittests
-mojo_public_utility_unittests
+  # Non-system, non-public tests:
+  {
+    "test": "clipboard_unittests"
+  },
+  {
+    "test": "mojo_application_manager_unittests"
+  },
+  {
+    "test": "mojo_common_unittests"
+  },
+  {
+    "test": "external_application_unittests"
+  },
+  {
+    # These tests currently crash. We should re-enable them when they pass.
+    "test": "mojo_view_manager_lib_unittests",
+    "disabled": true
+  },
+  {
+    "test": "mojo_surfaces_lib_unittests"
+  },
+  {
+    "test": "view_manager_service_unittests"
+  },
+  {
+    "test": "view_manager_unittests"
+  },
+  {
+    "test": "window_manager_unittests"
+  },
 
-# Non-system, non-public tests:
-clipboard_unittests
-mojo_application_manager_unittests
-mojo_common_unittests
-external_application_unittests
-# These tests currently crash. We should re-enable them when they pass.
-# mojo_view_manager_lib_unittests
-mojo_surfaces_lib_unittests
-view_manager_service_unittests
-view_manager_unittests
-window_manager_unittests
+  # JavaScript tests:
+  {
+    "test": "js_unittests",
+    "cacheable": false
+  },
+  {
+    "test": "js_integration_tests",
+    "cacheable": false
+  },
+  {
+    "test": "js_services_unittests",
+    "cacheable": false
+  },
 
-# JavaScript tests:
-*js_unittests
-*js_integration_tests
-*js_services_unittests
-
-# Shell integration tests:
-*mojo_shell_tests
+  # Shell integration tests:
+  {
+    "test": "mojo_shell_tests",
+    "cacheable": false
+  }
+]