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

ui/base/resource/resource_bundle_android.cc

Index: ui/base/resource/resource_bundle_android.cc
===================================================================
--- ui/base/resource/resource_bundle_android.cc	(revision 132528)
+++ ui/base/resource/resource_bundle_android.cc	(working copy)
@@ -12,23 +12,14 @@
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 
-namespace {
-
-FilePath GetResourcesPakFilePath(const std::string& pak_name) {
-  FilePath path;
-  PathService::Get(base::DIR_ANDROID_APP_DATA, &path);
-  DCHECK(!path.empty());
-  return path.AppendASCII("paks").AppendASCII(pak_name.c_str());
-}
-
-}  // namespace
-
 namespace ui {
 
 void ResourceBundle::LoadCommonResources() {
-  AddDataPack(GetResourcesPakFilePath("chrome.pak"));
-  AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"));
-  AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"));
+  FilePath data_path;
+  PathService::Get(base::DIR_ANDROID_APP_DATA, &data_path);
+  DCHECK(!data_path.empty());
+  data_path = data_path.AppendASCII("paks").AppendASCII("chrome.pak");
+  AddDataPack(data_path);
 }
 
 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {