Initial fixes to run unit_tests bundle on android.

BUG=138115

TEST=


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

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

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.

chrome/browser/download/download_util.cc

@@ -166,12 +166,17 @@ bool DownloadPathIsDangerous(const FilePath& download_path) {
   }
 #endif
 
+#if defined(OS_ANDROID)
+  // Android does not have a desktop dir.
+  return false;
+#else
   FilePath desktop_dir;
   if (!PathService::Get(chrome::DIR_USER_DESKTOP, &desktop_dir)) {
     NOTREACHED();
     return false;
   }
   return (download_path == desktop_dir);
+#endif
 }
 
 // Download progress painting --------------------------------------------------

chrome/browser/prefs/browser_prefs.cc

@@ -198,6 +198,7 @@ void RegisterUserPrefs(PrefService* user_prefs) {
   chrome_browser_net::HttpServerPropertiesManager::RegisterPrefs(user_prefs);
   chrome_browser_net::Predictor::RegisterUserPrefs(user_prefs);
   DownloadPrefs::RegisterUserPrefs(user_prefs);
+  ExtensionWebUI::RegisterUserPrefs(user_prefs);
   GAIAInfoUpdateService::RegisterUserPrefs(user_prefs);
   HostContentSettingsMap::RegisterUserPrefs(user_prefs);
   IncognitoModePrefs::RegisterUserPrefs(user_prefs);
@@ -240,7 +241,6 @@ void RegisterUserPrefs(PrefService* user_prefs) {
   extensions::ComponentLoader::RegisterUserPrefs(user_prefs);
   extensions::ExtensionPrefs::RegisterUserPrefs(user_prefs);
   ExtensionSettingsHandler::RegisterUserPrefs(user_prefs);
-  ExtensionWebUI::RegisterUserPrefs(user_prefs);
   RegisterBrowserUserPrefs(user_prefs);
   RegisterAutolaunchPrefs(user_prefs);
   DevToolsWindow::RegisterUserPrefs(user_prefs);