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

ui/test/test_suite.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/test/test_suite.h"
 
 #include "base/file_path.h"
 #include "base/path_service.h"
 #include "build/build_config.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 28 matching lines @@
   path = path.AppendASCII("Chromium Framework.framework");
 #else
 #error Unknown branding
 #endif
   base::mac::SetOverrideFrameworkBundlePath(path);
 #elif defined(OS_POSIX)
   FilePath pak_dir;
   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() {
   ui::ResourceBundle::CleanupSharedInstance();
 
 #if defined(OS_MACOSX)
   base::mac::SetOverrideFrameworkBundle(NULL);
 #endif
   base::TestSuite::Shutdown();
 }
 
 }  // namespace test
 }  // namespace ui