gfx: Make conversions from gfx::Point to PointF explicit.

ui/gfx/geometry/point.h

Index: ui/gfx/geometry/point.h
diff --git a/ui/gfx/geometry/point.h b/ui/gfx/geometry/point.h
index a1686fb8abcc187b49ff7b272bee4475dbb678b3..d3be2ac8b0851bcedd712ab61d631a8b911edb1c 100644
--- a/ui/gfx/geometry/point.h
+++ b/ui/gfx/geometry/point.h
@@ -8,7 +8,6 @@
 #include <iosfwd>
 #include <string>
 
-#include "ui/gfx/geometry/point_f.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/gfx/gfx_export.h"
 
@@ -87,10 +86,6 @@ class GFX_EXPORT Point {
     return (y_ == rhs.y_) ? (x_ < rhs.x_) : (y_ < rhs.y_);
   }
 
-  operator PointF() const {
-    return PointF(static_cast<float>(x()), static_cast<float>(y()));
-  }
-
   // Returns a string representation of point.
   std::string ToString() const;
 
@@ -132,6 +127,20 @@ inline Point PointAtOffsetFromOrigin(const Vector2d& offset_from_origin) {
 // This should not be used in production code - call ToString() instead.
 void PrintTo(const Point& point, ::std::ostream* os);
 
+// Helper methods to scale a gfx::Point to a new gfx::Point.
+GFX_EXPORT Point ScaleToCeiledPoint(const Point& point,
+                                    float x_scale,
+                                    float y_scale);
+GFX_EXPORT Point ScaleToCeiledPoint(const Point& point, float x_scale);
+GFX_EXPORT Point ScaleToFlooredPoint(const Point& point,
+                                     float x_scale,
+                                     float y_scale);
+GFX_EXPORT Point ScaleToFlooredPoint(const Point& point, float x_scale);
+GFX_EXPORT Point ScaleToRoundedPoint(const Point& point,
+                                     float x_scale,
+                                     float y_scale);
+GFX_EXPORT Point ScaleToRoundedPoint(const Point& point, float x_scale);
+
 }  // namespace gfx
 
 #endif  // UI_GFX_GEOMETRY_POINT_H_