Enable arbitrary scale factor

ui/base/resource/resource_bundle_unittest.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 "base/base_paths.h"
 #include "base/big_endian.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ skipping 474 matching lines @@
       GetScaleForScaleFactor(ui::SCALE_FACTOR_200P));
   EXPECT_EQ(ui::SCALE_FACTOR_200P, GetSupportedScaleFactor(image_rep.scale()));
 
   // The 1.4x pack was not loaded. Requesting the 1.4x resource should return
   // either the 1x or the 2x resource.
   image_rep = image_skia->GetRepresentation(
       ui::GetScaleForScaleFactor(ui::SCALE_FACTOR_140P));
   ui::ScaleFactor scale_factor = GetSupportedScaleFactor(image_rep.scale());
   EXPECT_TRUE(scale_factor == ui::SCALE_FACTOR_100P ||
               scale_factor == ui::SCALE_FACTOR_200P);
-#if !defined(OS_WIN)
-  // If the image is not found, the it should simply image rep should
-  // contain the scale of the image rep, not the requested scale.
-  EXPECT_EQ(1.0f, image_skia->GetRepresentation(1.4f).scale());
-#endif
+
+  // ImageSkia scales image if the one for the requested scale factor is not
+  // available.
+  EXPECT_EQ(1.4f, image_skia->GetRepresentation(1.4f).scale());
 }
 
 // Test that GetImageNamed() behaves properly for images which GRIT has
 // annotated as having fallen back to 1x.
 TEST_F(ResourceBundleImageTest, GetImageNamedFallback1x) {
   std::vector<ScaleFactor> supported_factors;
   supported_factors.push_back(SCALE_FACTOR_100P);
   supported_factors.push_back(SCALE_FACTOR_200P);
   test::ScopedSetSupportedScaleFactors scoped_supported(supported_factors);
   base::FilePath data_path = dir_path().AppendASCII("sample.pak");
@@ skipping 82 matching lines @@
   resource_bundle->AddDataPackFromPath(data_default_path, SCALE_FACTOR_NONE);
 
   gfx::ImageSkia* image_skia = resource_bundle->GetImageSkiaNamed(3);
   EXPECT_EQ(1u, image_skia->image_reps().size());
   EXPECT_TRUE(image_skia->image_reps()[0].unscaled());
   EXPECT_EQ(ui::SCALE_FACTOR_100P,
             GetSupportedScaleFactor(image_skia->image_reps()[0].scale()));
 }
 
 }  // namespace ui