summaryrefslogtreecommitdiffstats
path: root/components/test/run_all_unittests.cc
diff options
context:
space:
mode:
Diffstat (limited to 'components/test/run_all_unittests.cc')
-rw-r--r--components/test/run_all_unittests.cc10
1 files changed, 8 insertions, 2 deletions
diff --git a/components/test/run_all_unittests.cc b/components/test/run_all_unittests.cc
index 5cd4102..9b59628 100644
--- a/components/test/run_all_unittests.cc
+++ b/components/test/run_all_unittests.cc
@@ -61,8 +61,14 @@ class ComponentsTestSuite : public base::TestSuite {
#else
PathService::Get(base::DIR_MODULE, &pak_path);
#endif
- ui::ResourceBundle::InitSharedInstanceWithPakPath(
- pak_path.AppendASCII("components_tests_resources.pak"));
+
+ base::FilePath ui_test_pak_path;
+ ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
+ ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
+
+ ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
+ pak_path.AppendASCII("components_tests_resources.pak"),
+ ui::SCALE_FACTOR_NONE);
// These schemes need to be added globally to pass tests of
// autocomplete_input_unittest.cc and content_settings_pattern*