Enable arbitrary scale factor

BUG=372212
R=mukai@chromium.org
TBR=sky@chromium.org

Review URL: https://codereview.chromium.org/326073005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276354 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 1 insertions, 15 deletions

diff --git a/ui/gfx/image/image_skia.cc b/ui/gfx/image/image_skia.cc
index b37cb7a..21d08de 100644
--- a/ui/gfx/image/image_skia.cc
+++ b/ui/gfx/image/image_skia.cc
@@ -319,13 +319,8 @@ ImageSkia ImageSkia::CreateFrom1xBitmap(const SkBitmap& bitmap) {
 
 bool ImageSkia::IsDSFScalingInImageSkiaEnabled() {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-#if defined(OS_WIN)
   return !command_line->HasSwitch(
-      switches::kDisallowArbitraryScaleFactorInImageSkia);
-#else
-  return command_line->HasSwitch(
-      switches::kAllowArbitraryScaleFactorInImageSkia);
-#endif
+      switches::kDisableArbitraryScaleFactorInImageSkia);
 }
 
 scoped_ptr<ImageSkia> ImageSkia::DeepCopy() const {
diff --git a/ui/gfx/image/image_skia_unittest.cc b/ui/gfx/image/image_skia_unittest.cc
index 15337a8..e3e93c7 100644
--- a/ui/gfx/image/image_skia_unittest.cc
+++ b/ui/gfx/image/image_skia_unittest.cc
@@ -424,9 +424,6 @@ TEST_F(ImageSkiaTest, 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;
@@ -497,9 +494,6 @@ TEST_F(ImageSkiaTest, ArbitraryScaleFactor) {
 }
 
 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;
@@ -517,9 +511,6 @@ TEST_F(ImageSkiaTest, ArbitraryScaleFactorWithMissingResource) {
 }
 
 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;