Remove dependency on ui::ScaleFactor from ui/gfx

ui/gfx/image/image_png_rep.h

Index: ui/gfx/image/image_png_rep.h
diff --git a/ui/gfx/image/image_png_rep.h b/ui/gfx/image/image_png_rep.h
index 7e5ce5b4e415f4c6553e950707de44128261089d..98e37454b7f37464355ac59e3c7a83c969218a4b 100644
--- a/ui/gfx/image/image_png_rep.h
+++ b/ui/gfx/image/image_png_rep.h
@@ -6,7 +6,6 @@
 #define UI_GFX_IMAGE_IMAGE_PNG_REP_H_
 
 #include "base/memory/ref_counted_memory.h"
-#include "ui/base/layout.h"
 #include "ui/gfx/gfx_export.h"
 
 namespace gfx {
@@ -15,9 +14,10 @@ class Size;
 // An ImagePNGRep represents a bitmap's png encoded data and the scale factor it
 // was intended for.
 struct UI_EXPORT ImagePNGRep {
+ public:
   ImagePNGRep();
   ImagePNGRep(const scoped_refptr<base::RefCountedMemory>& data,
-              ui::ScaleFactor data_scale_factor);
+              float data_scale);
   ~ImagePNGRep();
 
   // Width and height of the image, in pixels.
@@ -27,7 +27,7 @@ struct UI_EXPORT ImagePNGRep {
   gfx::Size Size() const;
 
   scoped_refptr<base::RefCountedMemory> raw_data;
-  ui::ScaleFactor scale_factor;
+  float scale;
 };
 
 }  // namespace gfx