diff options
| author | benm@chromium.org <benm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-07 10:39:06 +0000 |
|---|---|---|
| committer | benm@chromium.org <benm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-07 10:39:06 +0000 |
| commit | 798668da313c13d7ebd35fb376db80544afb237f (patch) | |
| tree | 051b2ceec6b47aa7f8a316b8c6449fdf7a24b084 /ui/test | |
| parent | 91aa8a30ad540dfc2f8ff21df2a627aa67d61790 (diff) | |
| download | chromium_src-798668da313c13d7ebd35fb376db80544afb237f.zip chromium_src-798668da313c13d7ebd35fb376db80544afb237f.tar.gz chromium_src-798668da313c13d7ebd35fb376db80544afb237f.tar.bz2 | |
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
Diffstat (limited to 'ui/test')
| -rw-r--r-- | ui/test/test_suite.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/test/test_suite.cc b/ui/test/test_suite.cc index 6f1a239..04dc943 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 |