Remove some implicit Point to PointF conversions, add helpers.

ui/gfx/win/dpi.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/win/dpi.h"
 
 #include <windows.h>
 #include "base/win/scoped_hdc.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/geometry/point_conversions.h"
@@ skipping 49 matching lines @@
     // Force 125% and below to 100% scale. We do this to maintain previous
     // (non-DPI-aware) behavior where only the font size was boosted.
     dpi_scale = 1.0;
   }
   return dpi_scale;
 }
 
 namespace win {
 
 Point ScreenToDIPPoint(const Point& pixel_point) {
-  return ToFlooredPoint(ScalePoint(pixel_point, 1.0f / GetDPIScale()));
+  return ScaleToFlooredPoint(pixel_point, 1.0f / GetDPIScale());
 }
 
 Point DIPToScreenPoint(const Point& dip_point) {
-  return ToFlooredPoint(ScalePoint(dip_point, GetDPIScale()));
+  return ScaleToFlooredPoint(dip_point, GetDPIScale());
 }
 
 Rect ScreenToDIPRect(const Rect& pixel_bounds) {
   // It's important we scale the origin and size separately. If we instead
   // calculated the size from the floored origin and ceiled right the size could
   // vary depending upon where the two points land. That would cause problems
   // for the places this code is used (in particular mapping from native window
   // bounds to DIPs).
   return Rect(ScreenToDIPPoint(pixel_bounds.origin()),
               ScreenToDIPSize(pixel_bounds.size()));
@@ skipping 14 matching lines @@
   // Always ceil sizes. Otherwise we may be leaving off part of the bounds.
   return ScaleToCeiledSize(dip_size, GetDPIScale());
 }
 
 int GetSystemMetricsInDIP(int metric) {
   return static_cast<int>(GetSystemMetrics(metric) / GetDPIScale() + 0.5);
 }
 
 }  // namespace win
 }  // namespace gfx