ui: Repack resources.

ui/base/resource/resource_bundle.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/base/resource/resource_bundle.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 271 matching lines @@
     return std::string();
   }
 
   locale_resources_data_.reset(data_pack.release());
   return app_locale;
 }
 
 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));
   }
 }
 
 void ResourceBundle::UnloadLocaleResources() {
   locale_resources_data_.reset();
 }
 
 void ResourceBundle::OverrideLocalePakForTest(const base::FilePath& pak_path) {
   overridden_pak_path_ = pak_path;
 }
@@ skipping 483 matching lines @@
 // static
 bool ResourceBundle::DecodePNG(const unsigned char* buf,
                                size_t size,
                                SkBitmap* bitmap,
                                bool* fell_back_to_1x) {
   *fell_back_to_1x = PNGContainsFallbackMarker(buf, size);
   return gfx::PNGCodec::Decode(buf, size, bitmap);
 }
 
 }  // namespace ui