Remove dependency on ui::ScaleFactor from ui/gfx

ui/gfx/image/image_unittest_util.h

Index: ui/gfx/image/image_unittest_util.h
diff --git a/ui/gfx/image/image_unittest_util.h b/ui/gfx/image/image_unittest_util.h
index a2293c8688b6e03be942c8c3b0a81b14fc8aa0d8..4788e4e100966ef9b09e08f5c0d33e89b65493a8 100644
--- a/ui/gfx/image/image_unittest_util.h
+++ b/ui/gfx/image/image_unittest_util.h
@@ -8,7 +8,6 @@
 #ifndef UI_GFX_IMAGE_IMAGE_UNITTEST_UTIL_H_
 #define UI_GFX_IMAGE_IMAGE_UNITTEST_UTIL_H_
 
-#include "ui/base/layout.h"
 #include "ui/gfx/image/image.h"
 #include "third_party/skia/include/core/SkColor.h"
 
@@ -25,7 +24,7 @@ typedef GdkPixbuf* PlatformImage;
 typedef gfx::ImageSkia PlatformImage;
 #endif
 
-std::vector<ui::ScaleFactor> Get1xAnd2xScaleFactors();
+std::vector<float> Get1xAnd2xScales();
 
 // Create a bitmap of |width|x|height|.
 const SkBitmap CreateBitmap(int width, int height);
@@ -65,7 +64,7 @@ bool ImageSkiaStructureMatches(
     const gfx::ImageSkia& image_skia,
     int width,
     int height,
-    const std::vector<ui::ScaleFactor>& scale_factors);
+    const std::vector<float>& scale_factors);
 
 bool IsEmpty(const gfx::Image& image);