Removed obsolete float_util.h as VS2013 supports standards well enough.

BUG=

Review URL: https://codereview.chromium.org/1076443002

Cr-Commit-Position: refs/heads/master@{#326781}

9 files changed, 25 insertions, 24 deletions

diff --git a/content/browser/android/java/gin_java_method_invocation_helper.cc b/content/browser/android/java/gin_java_method_invocation_helper.cc
index ae1c798..93ab2e6 100644
--- a/content/browser/android/java/gin_java_method_invocation_helper.cc
+++ b/content/browser/android/java/gin_java_method_invocation_helper.cc
@@ -6,10 +6,11 @@
 
 #include <unistd.h>
 
+#include <cmath>
+
 #include "base/android/event_log.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
-#include "base/float_util.h"
 #include "content/browser/android/java/gin_java_script_to_java_types_coercion.h"
 #include "content/browser/android/java/java_method.h"
 #include "content/browser/android/java/jni_helper.h"
@@ -256,7 +257,7 @@ void GinJavaMethodInvocationHelper::InvokeMethod(jobject object,
       float result = object
                          ? env->CallFloatMethodA(object, id, parameters)
                          : env->CallStaticFloatMethodA(clazz, id, parameters);
-      if (base::IsFinite(result)) {
+      if (std::isfinite(result)) {
         result_wrapper.AppendDouble(result);
       } else {
         result_wrapper.Append(
@@ -268,7 +269,7 @@ void GinJavaMethodInvocationHelper::InvokeMethod(jobject object,
       double result = object
                           ? env->CallDoubleMethodA(object, id, parameters)
                           : env->CallStaticDoubleMethodA(clazz, id, parameters);
-      if (base::IsFinite(result)) {
+      if (std::isfinite(result)) {
         result_wrapper.AppendDouble(result);
       } else {
         result_wrapper.Append(
diff --git a/content/browser/renderer_host/input/motion_event_android.cc b/content/browser/renderer_host/input/motion_event_android.cc
index 3f18f95..5a437f4 100644
--- a/content/browser/renderer_host/input/motion_event_android.cc
+++ b/content/browser/renderer_host/input/motion_event_android.cc
@@ -6,8 +6,9 @@
 
 #include <android/input.h>
 
+#include <cmath>
+
 #include "base/android/jni_android.h"
-#include "base/float_util.h"
 #include "jni/MotionEvent_jni.h"
 #include "ui/events/event_constants.h"
 
@@ -92,7 +93,7 @@ base::TimeTicks FromAndroidTime(int64 time_ms) {
 }
 
 float ToValidFloat(float x) {
-  if (base::IsNaN(x))
+  if (std::isnan(x))
     return 0.f;
 
   // Wildly large orientation values have been observed in the wild after device
diff --git a/content/browser/renderer_host/input/motion_event_android_unittest.cc b/content/browser/renderer_host/input/motion_event_android_unittest.cc
index 20b9a52..9a33b31 100644
--- a/content/browser/renderer_host/input/motion_event_android_unittest.cc
+++ b/content/browser/renderer_host/input/motion_event_android_unittest.cc
@@ -5,7 +5,6 @@
 #include <android/input.h>
 
 #include "base/android/jni_android.h"
-#include "base/float_util.h"
 #include "content/browser/renderer_host/input/motion_event_android.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event_constants.h"
diff --git a/content/child/v8_value_converter_impl.cc b/content/child/v8_value_converter_impl.cc
index 6ff8797..9efd429 100644
--- a/content/child/v8_value_converter_impl.cc
+++ b/content/child/v8_value_converter_impl.cc
@@ -4,11 +4,11 @@
 
 #include "content/child/v8_value_converter_impl.h"
 
+#include <cmath>
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
-#include "base/float_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
@@ -309,7 +309,7 @@ base::Value* V8ValueConverterImpl::FromV8ValueImpl(
 
   if (val->IsNumber()) {
     double val_as_double = val.As<v8::Number>()->Value();
-    if (!base::IsFinite(val_as_double))
+    if (!std::isfinite(val_as_double))
       return NULL;
     return new base::FundamentalValue(val_as_double);
   }
diff --git a/content/common/android/gin_java_bridge_value_unittest.cc b/content/common/android/gin_java_bridge_value_unittest.cc
index 72a0ea8..0276848 100644
--- a/content/common/android/gin_java_bridge_value_unittest.cc
+++ b/content/common/android/gin_java_bridge_value_unittest.cc
@@ -2,8 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <cmath>
+
 #include "base/basictypes.h"
-#include "base/float_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/common/android/gin_java_bridge_value.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -40,8 +41,7 @@ TEST_F(GinJavaBridgeValueTest, BasicValues) {
   ASSERT_TRUE(float_infinity_value.get());
   EXPECT_TRUE(float_infinity_value->IsType(GinJavaBridgeValue::TYPE_NONFINITE));
   EXPECT_TRUE(float_infinity_value->GetAsNonFinite(&native_float));
-  EXPECT_FALSE(base::IsFinite(native_float));
-  EXPECT_FALSE(base::IsNaN(native_float));
+  EXPECT_TRUE(std::isinf(native_float));
 
   EXPECT_FALSE(undefined_value->GetAsObjectID(&native_object_id));
 
@@ -57,8 +57,7 @@ TEST_F(GinJavaBridgeValueTest, BasicValues) {
   EXPECT_TRUE(
       double_infinity_value->IsType(GinJavaBridgeValue::TYPE_NONFINITE));
   EXPECT_TRUE(double_infinity_value->GetAsNonFinite(&native_float));
-  EXPECT_FALSE(base::IsFinite(native_float));
-  EXPECT_FALSE(base::IsNaN(native_float));
+  EXPECT_TRUE(std::isinf(native_float));
 
   EXPECT_FALSE(undefined_value->GetAsObjectID(&native_object_id));
 
diff --git a/content/common/page_state_serialization_unittest.cc b/content/common/page_state_serialization_unittest.cc
index 6dc775a..38f04f8 100644
--- a/content/common/page_state_serialization_unittest.cc
+++ b/content/common/page_state_serialization_unittest.cc
@@ -2,11 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <math.h>
+#include <cmath>
 
 #include "base/base64.h"
 #include "base/files/file_util.h"
-#include "base/float_util.h"
 #include "base/path_service.h"
 #include "base/pickle.h"
 #include "base/strings/string_util.h"
@@ -47,8 +46,8 @@ void ExpectEquality(const ExplodedHttpBodyElement& a,
   EXPECT_EQ(a.filesystem_url, b.filesystem_url);
   EXPECT_EQ(a.file_start, b.file_start);
   EXPECT_EQ(a.file_length, b.file_length);
-  if (!(base::IsNaN(a.file_modification_time) &&
-        base::IsNaN(b.file_modification_time))) {
+  if (!(std::isnan(a.file_modification_time) &&
+        std::isnan(b.file_modification_time))) {
     EXPECT_DOUBLE_EQ(a.file_modification_time, b.file_modification_time);
   }
   EXPECT_EQ(a.blob_uuid, b.blob_uuid);
diff --git a/content/renderer/java/gin_java_bridge_value_converter.cc b/content/renderer/java/gin_java_bridge_value_converter.cc
index c1727a4..6486082 100644
--- a/content/renderer/java/gin_java_bridge_value_converter.cc
+++ b/content/renderer/java/gin_java_bridge_value_converter.cc
@@ -4,7 +4,8 @@
 
 #include "content/renderer/java/gin_java_bridge_value_converter.h"
 
-#include "base/float_util.h"
+#include <cmath>
+
 #include "base/values.h"
 #include "content/common/android/gin_java_bridge_value.h"
 #include "content/renderer/java/gin_java_bridge_object.h"
@@ -148,7 +149,7 @@ bool GinJavaBridgeValueConverter::FromV8ArrayBuffer(
 bool GinJavaBridgeValueConverter::FromV8Number(v8::Handle<v8::Number> value,
                                                base::Value** out) const {
   double double_value = value->Value();
-  if (base::IsFinite(double_value))
+  if (std::isfinite(double_value))
     return false;
   *out = GinJavaBridgeValue::CreateNonFiniteValue(double_value).release();
   return true;
diff --git a/content/renderer/java/gin_java_bridge_value_converter_unittest.cc b/content/renderer/java/gin_java_bridge_value_converter_unittest.cc
index edffce7..b0ef27a 100644
--- a/content/renderer/java/gin_java_bridge_value_converter_unittest.cc
+++ b/content/renderer/java/gin_java_bridge_value_converter_unittest.cc
@@ -2,8 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <cmath>
+
 #include "base/basictypes.h"
-#include "base/float_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "content/common/android/gin_java_bridge_value.h"
@@ -67,8 +68,7 @@ TEST_F(GinJavaBridgeValueConverterTest, BasicValues) {
   EXPECT_TRUE(
       infinity_value->IsType(GinJavaBridgeValue::TYPE_NONFINITE));
   EXPECT_TRUE(infinity_value->GetAsNonFinite(&native_float));
-  EXPECT_FALSE(base::IsFinite(native_float));
-  EXPECT_FALSE(base::IsNaN(native_float));
+  EXPECT_TRUE(std::isinf(native_float));
 }
 
 TEST_F(GinJavaBridgeValueConverterTest, ArrayBuffer) {
diff --git a/content/renderer/media/media_stream_audio_level_calculator.cc b/content/renderer/media/media_stream_audio_level_calculator.cc
index 320b1ab..ad76a43 100644
--- a/content/renderer/media/media_stream_audio_level_calculator.cc
+++ b/content/renderer/media/media_stream_audio_level_calculator.cc
@@ -4,7 +4,8 @@
 
 #include "content/renderer/media/media_stream_audio_level_calculator.h"
 
-#include "base/float_util.h"
+#include <cmath>
+
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "media/base/audio_bus.h"
@@ -21,7 +22,7 @@ float MaxAmplitude(const float* audio_data, int length) {
     if (absolute > max)
       max = absolute;
   }
-  DCHECK(base::IsFinite(max));
+  DCHECK(std::isfinite(max));
   return max;
 }