Enable arbitrary scale factor

ui/gfx/image/image_skia_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/gfx/image/image_skia.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/threading/simple_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 406 matching lines @@
   ImageSkiaRep rep_2x(Size(100, 100), 2.0f);
 
   // When reps for other scales are added, the unscaled image
   // becomes scaled.
   image_skia.AddRepresentation(rep_2x);
   EXPECT_FALSE(image_skia.GetRepresentation(1.0f).unscaled());
   EXPECT_FALSE(image_skia.GetRepresentation(2.0f).unscaled());
 }
 
 TEST_F(ImageSkiaTest, ArbitraryScaleFactor) {
-  base::CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kAllowArbitraryScaleFactorInImageSkia);
-
   // Do not test if the ImageSkia doesn't support arbitrary scale factors.
   if (!ImageSkia::IsDSFScalingInImageSkiaEnabled())
     return;
 
   // source is owned by |image|
   DynamicSource* source = new DynamicSource(Size(100, 200));
   ImageSkia image(source, gfx::Size(100, 200));
 
   image.GetRepresentation(1.5f);
   EXPECT_EQ(2.0f, source->GetLastRequestedScaleAndReset());
@@ skipping 50 matching lines @@
 
   // Scale factor greater than 2.0f is falled back to 2.0f because it's not
   // supported.
   image.GetRepresentation(3.0f);
   EXPECT_EQ(0.0f, source->GetLastRequestedScaleAndReset());
   image_reps = image.image_reps();
   EXPECT_EQ(7u, image_reps.size());
 }
 
 TEST_F(ImageSkiaTest, ArbitraryScaleFactorWithMissingResource) {
-  base::CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kAllowArbitraryScaleFactorInImageSkia);
-
   // Do not test if the ImageSkia doesn't support arbitrary scale factors.
   if (!ImageSkia::IsDSFScalingInImageSkiaEnabled())
     return;
 
   ImageSkia image(new FixedSource(
       ImageSkiaRep(Size(100, 200), 1.0f)), Size(100, 200));
 
   // Requesting 1.5f -- falls back to 2.0f, but couldn't find. It should
   // look up 1.0f and then rescale it.
   const ImageSkiaRep& rep = image.GetRepresentation(1.5f);
   EXPECT_EQ(1.5f, rep.scale());
   EXPECT_EQ(2U, image.image_reps().size());
   EXPECT_EQ(1.0f, image.image_reps()[0].scale());
   EXPECT_EQ(1.5f, image.image_reps()[1].scale());
 }
 
 TEST_F(ImageSkiaTest, UnscaledImageForArbitraryScaleFactor) {
-  base::CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kAllowArbitraryScaleFactorInImageSkia);
-
   // Do not test if the ImageSkia doesn't support arbitrary scale factors.
   if (!ImageSkia::IsDSFScalingInImageSkiaEnabled())
     return;
 
   // 0.0f means unscaled.
   ImageSkia image(new FixedSource(
       ImageSkiaRep(Size(100, 200), 0.0f)), Size(100, 200));
 
   // Requesting 2.0f, which should return 1.0f unscaled image.
   const ImageSkiaRep& rep = image.GetRepresentation(2.0f);
@@ skipping 10 matching lines @@
   EXPECT_EQ(1U, image.image_reps().size());
 
   const ImageSkiaRep& rep12 = image.GetRepresentation(1.2f);
   EXPECT_EQ(1.0f, rep12.scale());
   EXPECT_EQ("100x200", rep12.pixel_size().ToString());
   EXPECT_TRUE(rep12.unscaled());
   EXPECT_EQ(1U, image.image_reps().size());
 }
 
 }  // namespace gfx