Remove dependency on ui::ScaleFactor from ui/gfx

ui/gfx/canvas_skia.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/canvas.h"
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/font_list.h"
@@ skipping 332 matching lines @@
                                     SkColor halo_color_in,
                                     const Rect& display_rect,
                                     int flags) {
   // Some callers will have semitransparent halo colors, which we don't handle
   // (since the resulting image can have 1-bit transparency only).
   SkColor halo_color = SkColorSetA(halo_color_in, 0xFF);
 
   // Create a temporary buffer filled with the halo color. It must leave room
   // for the 1-pixel border around the text.
   Size size(display_rect.width() + 2, display_rect.height() + 2);
-  Canvas text_canvas(size, scale_factor(), true);
+  Canvas text_canvas(size, image_scale(), true);
   SkPaint bkgnd_paint;
   bkgnd_paint.setColor(halo_color);
   text_canvas.DrawRect(Rect(size), bkgnd_paint);
 
   // Draw the text into the temporary buffer. This will have correct
   // ClearType since the background color is the same as the halo color.
   text_canvas.DrawStringRectWithFlags(
       text, font_list, text_color,
       Rect(1, 1, display_rect.width(), display_rect.height()), flags);
 
@@ skipping 10 matching lines @@
         if (!PixelShouldGetHalo(text_bitmap, cur_x, cur_y, halo_premul))
           text_row[cur_x] = 0;  // Make transparent.
       } else {
         text_row[cur_x] |= 0xff << SK_A32_SHIFT;  // Make opaque.
       }
     }
   }
 
   // Draw the halo bitmap with blur.
   ImageSkia text_image = ImageSkia(ImageSkiaRep(text_bitmap,
-      text_canvas.scale_factor()));
+      text_canvas.image_scale()));
   DrawImageInt(text_image, display_rect.x() - 1, display_rect.y() - 1);
 }
 
 void Canvas::DrawFadeTruncatingStringRect(
     const base::string16& text,
     TruncateFadeMode truncate_mode,
     size_t desired_characters_to_truncate_from_head,
     const FontList& font_list,
     SkColor color,
     const Rect& display_rect) {
@@ skipping 68 matching lines @@
     size_t desired_characters_to_truncate_from_head,
     const Font& font,
     SkColor color,
     const Rect& display_rect) {
   DrawFadeTruncatingStringRect(text, truncate_mode,
                                desired_characters_to_truncate_from_head,
                                FontList(font), color, display_rect);
 }
 
 }  // namespace gfx