Fix sporadic Android ui_unittest failures.

Make sure we get the correct path to data packs on Android
for the UI unit tests.


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

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

ui/test/test_suite.cc

@@ -44,9 +44,13 @@ void UITestSuite::Initialize() {
   base::mac::SetOverrideFrameworkBundlePath(path);
 #elif defined(OS_POSIX)
   FilePath pak_dir;
+#if defined(OS_ANDROID)
+  PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &pak_dir);
+#else
   PathService::Get(base::DIR_MODULE, &pak_dir);
   pak_dir = pak_dir.AppendASCII("ui_unittests_strings");
   PathService::Override(ui::DIR_LOCALES, pak_dir);
+#endif  // defined(OS_ANDROID)
 #endif  // defined(OS_MACOSX)
 
   // Force unittests to run using en-US so if we test against string