Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(322)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/test/test_suite.cc

Issue 10826148: Fix sporadic Android ui_unittest failures. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/test/test_suite.cc
diff --git a/ui/test/test_suite.cc b/ui/test/test_suite.cc
index 6f1a239bd267e8fe3a10f421cb369e8b02d6f73f..04dc943d5b752d2778c23d89d59a12f2443534a5 100644
--- a/ui/test/test_suite.cc
+++ b/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
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698