Update from https://crrev.com/327068

ui/events/gesture_detection/scale_gesture_detector.cc

 // Copyright 2014 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/events/gesture_detection/scale_gesture_detector.h"
 
 #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"
 
 using base::TimeDelta;
 using base::TimeTicks;
 
 namespace ui {
 namespace {
 
@@ skipping 257 matching lines @@
 void ScaleGestureDetector::AddTouchHistory(const MotionEvent& ev) {
   const base::TimeTicks current_time = ev.GetEventTime();
   DCHECK(!current_time.is_null());
   const int count = static_cast<int>(ev.GetPointerCount());
   bool accept = touch_history_last_accepted_time_.is_null() ||
                 (current_time - touch_history_last_accepted_time_) >=
                     base::TimeDelta::FromMilliseconds(kTouchStabilizeTimeMs);
   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++) {
       float major;
       if (h < history_size) {
         major = ev.GetHistoricalTouchMajor(i, h);
       } else {
         major = ev.GetTouchMajor(i);
       }
       if (major < touch_min_major_)
         major = touch_min_major_;
       if (major > touch_max_major_)
         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;
       }
 
       if (has_last_accepted) {
         const float major_delta = major - touch_history_last_accepted_;
         const int direction_sig =
             major_delta > 0 ? 1 : (major_delta < 0 ? -1 : 0);
         if (direction_sig != touch_history_direction_ ||
             (direction_sig == 0 && touch_history_direction_ == 0)) {
           touch_history_direction_ = direction_sig;
@@ skipping 27 matching lines @@
   touch_history_last_accepted_time_ = base::TimeTicks();
 }
 
 void ScaleGestureDetector::ResetScaleWithSpan(float span) {
   in_progress_ = false;
   initial_span_ = span;
   double_tap_mode_ = DOUBLE_TAP_MODE_NONE;
 }
 
 }  // namespace ui