diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-17 21:23:21 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-17 21:23:21 +0000 |
| commit | 29965d21780a8c9abf12be5ea8e1306986c284d6 (patch) | |
| tree | f6d02101a36ff5b7421400b4522161ddd4aed237 /chrome/test/base/chrome_test_suite.cc | |
| parent | acfb30c8f961919e804a4b10f3ab456c08fbf4ca (diff) | |
| download | chromium_src-29965d21780a8c9abf12be5ea8e1306986c284d6.zip chromium_src-29965d21780a8c9abf12be5ea8e1306986c284d6.tar.gz chromium_src-29965d21780a8c9abf12be5ea8e1306986c284d6.tar.bz2 | |
Revert 177477
> Fix resource.pak lookup for unit_test suite.
>
> It shouldn't be manually loading resources.pak. Instead it should be using chrome::FILE_RESOURCES_PACK
> which gets correctly redirected to the right place
> (see chrome_paths.cc where chrome::FILE_RESOURCES_PACK uses ui::DIR_RESOURCE_PAKS_ANDROID
> instead of just DIR_MODULE on android).
>
> BUG=170702
>
> Review URL: https://codereview.chromium.org/12006002
TBR=yfriedman@chromium.org
Review URL: https://codereview.chromium.org/11969048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177489 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/base/chrome_test_suite.cc')
| -rw-r--r-- | chrome/test/base/chrome_test_suite.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/test/base/chrome_test_suite.cc b/chrome/test/base/chrome_test_suite.cc index dd9ad36..a1791ae 100644 --- a/chrome/test/base/chrome_test_suite.cc +++ b/chrome/test/base/chrome_test_suite.cc @@ -233,7 +233,9 @@ void ChromeTestSuite::Initialize() { // output, it'll pass regardless of the system language. ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); FilePath resources_pack_path; - PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path); + PathService::Get(base::DIR_MODULE, &resources_pack_path); + resources_pack_path = + resources_pack_path.Append(FILE_PATH_LITERAL("resources.pak")); ResourceBundle::GetSharedInstance().AddDataPackFromPath( resources_pack_path, ui::SCALE_FACTOR_NONE); |