ui: Repack resources.

ui/base/resource/resource_bundle.cc

Index: ui/base/resource/resource_bundle.cc
diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
index a6185bc4f5e53bcc2490aa699819d645bde3740c..92234cbf1f7be0b4526a310e7d5a7688aedd00e8 100644
--- a/ui/base/resource/resource_bundle.cc
+++ b/ui/base/resource/resource_bundle.cc
@@ -289,17 +289,15 @@ std::string ResourceBundle::LoadLocaleResources(
 void ResourceBundle::LoadTestResources(const base::FilePath& path,
                                        const base::FilePath& locale_path) {
   // Use the given resource pak for both common and localized resources.
-  scoped_ptr<DataPack> data_pack(
-      new DataPack(SCALE_FACTOR_100P));
+  scoped_ptr<DataPack> data_pack(new DataPack(SCALE_FACTOR_100P));
   if (!path.empty() && data_pack->LoadFromPath(path))
     AddDataPack(data_pack.release());
 
-  data_pack.reset(new DataPack(ui::SCALE_FACTOR_NONE));
+  data_pack.reset(new DataPack(ui::SCALE_FACTOR_100P));

[tfarina, 2013/11/07 00:05:46]

does this sounds more reasonable? is it ok if it passes the trybots?

[tony, 2013/11/07 18:13:37]

I think this is OK.  Why does this work?  It doesn't look like scale factor
should matter for locale_resources_data_.

[tfarina, 2013/11/09 00:24:35]

Yeah, it does not seem to matter. The failing unit tests are getting disabled at
crbug.com/316955. The first clobber try I sent failed at those tests. I sent
another. I hope it will pass this time.

   if (!locale_path.empty() && data_pack->LoadFromPath(locale_path)) {
     locale_resources_data_.reset(data_pack.release());
   } else {
-    locale_resources_data_.reset(
-        new DataPack(ui::SCALE_FACTOR_NONE));
+    locale_resources_data_.reset(new DataPack(ui::SCALE_FACTOR_NONE));
   }
 }