Remove some implicit Point to PointF conversions, add helpers.

ash/touch/touch_uma.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 "ash/touch/touch_uma.h"
 
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/shell.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/stringprintf.h"
@@ skipping 90 matching lines @@
   const int bucket_size_x = std::max(1,
                                      bounds.width() / kBucketCountForLocation);
   const int bucket_size_y = std::max(1,
                                      bounds.height() / kBucketCountForLocation);
 
   gfx::Point position = event.root_location();
 
   // Prefer raw event location (when available) over calibrated location.
   if (event.HasNativeEvent()) {
     position = ui::EventLocationFromNative(event.native_event());
-    position = gfx::ToFlooredPoint(
-        gfx::ScalePoint(position, 1. / target->layer()->device_scale_factor()));
+    position = gfx::ScaleToFlooredPoint(
+        position, 1.f / target->layer()->device_scale_factor());
   }
 
   position.set_x(std::min(bounds.width() - 1, std::max(0, position.x())));
   position.set_y(std::min(bounds.height() - 1, std::max(0, position.y())));
 
   UMA_HISTOGRAM_CUSTOM_COUNTS("Ash.TouchPositionX",
       position.x() / bucket_size_x,
       0, kBucketCountForLocation, kBucketCountForLocation + 1);
   UMA_HISTOGRAM_CUSTOM_COUNTS("Ash.TouchPositionY",
       position.y() / bucket_size_y,
@@ skipping 176 matching lines @@
       return GESTURE_OMNIBOX_SCROLL;
     if (event.type() == ui::ET_GESTURE_PINCH_BEGIN)
       return GESTURE_OMNIBOX_PINCH;
     return GESTURE_UNKNOWN;
   }
 
   return GESTURE_UNKNOWN;
 }
 
 }  // namespace ash