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

Unified Diff: components/test/run_all_unittests.cc

Issue 537063002: Eliminate silently letting errors pass on pak loading. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: one last time Created 6 years, 2 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
Index: components/test/run_all_unittests.cc
diff --git a/components/test/run_all_unittests.cc b/components/test/run_all_unittests.cc
index 26a15afcb84f6500bec220efbf39c6b049745f31..2a5b6a49f258eeab10544f3a159783de13239626 100644
--- a/components/test/run_all_unittests.cc
+++ b/components/test/run_all_unittests.cc
@@ -82,10 +82,14 @@ class ComponentsTestSuite : public base::TestSuite {
// 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_path;
- PathService::Get(base::DIR_MODULE, &resources_pack_path);
+ 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
ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
- resources_pack_path.AppendASCII("resources.pak"),
+ resources_pack_dir.AppendASCII("resources.pak"),
ui::SCALE_FACTOR_NONE);
// These schemes need to be added globally to pass tests of

Powered by Google App Engine
This is Rietveld 408576698