diff options
| author | shashishekhar@chromium.org <shashishekhar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-25 01:57:25 +0000 |
|---|---|---|
| committer | shashishekhar@chromium.org <shashishekhar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-25 01:57:25 +0000 |
| commit | a0474adb323a320f8d0b509fbd04c0df425883e5 (patch) | |
| tree | 5682605578b5d1dcc5660cbdd17eab7ff781ede7 /content/test/test_content_client.cc | |
| parent | 5b1d8c45503e1b0cc75e0dc8e52eadf441de1f53 (diff) | |
| download | chromium_src-a0474adb323a320f8d0b509fbd04c0df425883e5.zip chromium_src-a0474adb323a320f8d0b509fbd04c0df425883e5.tar.gz chromium_src-a0474adb323a320f8d0b509fbd04c0df425883e5.tar.bz2 | |
Fix resource path for content_unittests.
On Android the paks files for tests are located in /sdcard/paks
directory.
BUG=157427
Review URL: https://chromiumcodereview.appspot.com/11233072
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163990 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/test_content_client.cc')
| -rw-r--r-- | content/test/test_content_client.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/content/test/test_content_client.cc b/content/test/test_content_client.cc index b8aeea5..7b53960 100644 --- a/content/test/test_content_client.cc +++ b/content/test/test_content_client.cc @@ -15,7 +15,14 @@ TestContentClient::TestContentClient() // content_resources.pak is not built on iOS as it is not required. #if !defined(OS_IOS) FilePath content_resources_pack_path; +#if defined(OS_ANDROID) + // on Android all pak files are inside the paks folder. + PathService::Get(base::DIR_ANDROID_APP_DATA, &content_resources_pack_path); + content_resources_pack_path = content_resources_pack_path.Append( + FILE_PATH_LITERAL("paks")); +#else PathService::Get(base::DIR_MODULE, &content_resources_pack_path); +#endif content_resources_pack_path = content_resources_pack_path.Append( FILE_PATH_LITERAL("content_resources.pak")); data_pack_.LoadFromPath(content_resources_pack_path); |