| Index: components/test/run_all_unittests.cc
|
| diff --git a/components/test/run_all_unittests.cc b/components/test/run_all_unittests.cc
|
| index 2a5b6a49f258eeab10544f3a159783de13239626..26a15afcb84f6500bec220efbf39c6b049745f31 100644
|
| --- a/components/test/run_all_unittests.cc
|
| +++ b/components/test/run_all_unittests.cc
|
| @@ -82,14 +82,10 @@
|
| // so we can load our pak file instead of chrome.pak. crbug.com/348563
|
| ui::ResourceBundle::InitSharedInstanceWithLocale(
|
| "en-US", NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
|
| - base::FilePath resources_pack_dir;
|
| -#if defined(OS_ANDROID)
|
| - PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &resources_pack_dir);
|
| -#else
|
| - PathService::Get(base::DIR_MODULE, &resources_pack_dir);
|
| -#endif
|
| + base::FilePath resources_pack_path;
|
| + PathService::Get(base::DIR_MODULE, &resources_pack_path);
|
| ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
|
| - resources_pack_dir.AppendASCII("resources.pak"),
|
| + resources_pack_path.AppendASCII("resources.pak"),
|
| ui::SCALE_FACTOR_NONE);
|
|
|
| // These schemes need to be added globally to pass tests of
|
|
|