Metro/HiDPI: Move 1x icons into separate pak file

ui/test/test_suite.cc

Index: ui/test/test_suite.cc
diff --git a/ui/test/test_suite.cc b/ui/test/test_suite.cc
index bd4e325e0eecdc002a39c89a6b63c71ed17c2dd1..024543e5c9e6d11c84dc6594f3406bd0160e8660 100644
--- a/ui/test/test_suite.cc
+++ b/ui/test/test_suite.cc
@@ -46,13 +46,16 @@ void UITestSuite::Initialize() {
   PathService::Get(base::DIR_MODULE, &pak_dir);
   pak_dir = pak_dir.AppendASCII("ui_unittests_strings");
   PathService::Override(ui::DIR_LOCALES, pak_dir);
-  PathService::Override(ui::FILE_RESOURCES_PAK,
-                        pak_dir.AppendASCII("ui_resources.pak"));
 #endif  // defined(OS_MACOSX)
 
   // Force unittests to run using en-US so if we test against string
   // output, it'll pass regardless of the system language.
   ui::ResourceBundle::InitSharedInstanceWithLocale("en-US");
+
+#if !defined(OS_MACOSX) && defined(OS_POSIX)
+  ui::ResourceBundle::GetSharedInstance().AddDataPack(
+      pak_dir.AppendASCII("ui_resources.pak"));
+#endif
 }
 
 void UITestSuite::Shutdown() {