Update from https://crrev.com/327068

ui/events/gesture_detection/scale_gesture_detector.cc

Index: ui/events/gesture_detection/scale_gesture_detector.cc
diff --git a/ui/events/gesture_detection/scale_gesture_detector.cc b/ui/events/gesture_detection/scale_gesture_detector.cc
index 7afe91fd3af28e90672f82002d1523495d98ce27..a8316c7cefeb291107bd26e852a1ace3eae21654 100644
--- a/ui/events/gesture_detection/scale_gesture_detector.cc
+++ b/ui/events/gesture_detection/scale_gesture_detector.cc
@@ -7,7 +7,6 @@
 #include <limits.h>
 #include <cmath>
 
-#include "base/float_util.h"
 #include "base/logging.h"
 #include "ui/events/gesture_detection/motion_event.h"
 #include "ui/events/gesture_detection/scale_gesture_listeners.h"
@@ -285,7 +284,7 @@ void ScaleGestureDetector::AddTouchHistory(const MotionEvent& ev) {
   float total = 0;
   int sample_count = 0;
   for (int i = 0; i < count; i++) {
-    const bool has_last_accepted = !base::IsNaN(touch_history_last_accepted_);
+    const bool has_last_accepted = !std::isnan(touch_history_last_accepted_);
     const int history_size = static_cast<int>(ev.GetHistorySize());
     const int pointersample_count = history_size + 1;
     for (int h = 0; h < pointersample_count; h++) {
@@ -301,10 +300,10 @@ void ScaleGestureDetector::AddTouchHistory(const MotionEvent& ev) {
         major = touch_max_major_;
       total += major;
 
-      if (base::IsNaN(touch_upper_) || major > touch_upper_) {
+      if (std::isnan(touch_upper_) || major > touch_upper_) {
         touch_upper_ = major;
       }
-      if (base::IsNaN(touch_lower_) || major < touch_lower_) {
+      if (std::isnan(touch_lower_) || major < touch_lower_) {
         touch_lower_ = major;
       }