Some fixes to run unit_tests bundle on android.

build/android/pylib/test_package.py

Index: build/android/pylib/test_package.py
diff --git a/build/android/pylib/test_package.py b/build/android/pylib/test_package.py
index 6ecbaa9525599447a775f5adae4c827e737fe08d..afba7bd91483be5534f912ad31bbe6e1da091666 100644
--- a/build/android/pylib/test_package.py
+++ b/build/android/pylib/test_package.py
@@ -106,11 +106,30 @@ class TestPackage(object):
     return ret
 
   def PushDataAndPakFiles(self):
-    if self.test_suite_basename == 'ui_unittests':
-      self.adb.PushIfNeeded(self.test_suite_dirname + '/chrome.pak',
-                            '/data/local/tmp/paks/chrome.pak')
-      self.adb.PushIfNeeded(self.test_suite_dirname + '/locales/en-US.pak',
-                            '/data/local/tmp/paks/en-US.pak')
+    if (self.test_suite_basename == 'ui_unittests' or
+        self.test_suite_basename == 'unit_tests'):
+      self.adb.PushIfNeeded(
+          self.test_suite_dirname + '/chrome.pak',
+          '/data/local/tmp/paks/chrome.pak')
+      self.adb.PushIfNeeded(
+          self.test_suite_dirname + '/locales/en-US.pak',
+          '/data/local/tmp/paks/en-US.pak')
+    if self.test_suite_basename == 'unit_tests':
+      self.adb.PushIfNeeded(
+          self.test_suite_dirname + '/resources.pak',
+          '/data/local/tmp/paks/resources.pak')
+      self.adb.PushIfNeeded(
+          self.test_suite_dirname + '/theme_resources_100_percent.pak',
+          '/data/local/tmp/paks/theme_resources_100_percent.pak')
+      self.adb.PushIfNeeded(
+          self.test_suite_dirname + '/ui_resources_100_percent.pak',
+          '/data/local/tmp/paks/ui_resources_100_percent.pak')
+      self.adb.PushIfNeeded(self.test_suite_dirname + '/test_data',
+                            '/data/local/tmp/test_data')
+    if self.test_suite_basename == 'content_unittests':
+      self.adb.PushIfNeeded(
+          self.test_suite_dirname + '/content_resources.pak',
+          '/data/local/tmp/paks/content_resources.pak')
 
   def _WatchTestOutput(self, p):
     """Watches the test output.