Merge from Chromium at DEPS revision r213057

This commit was generated by merge_to_master.py.

Change-Id: I3e2e2506eb9b0080157e9c5f133559df3e600388
diff --git a/base/float_util.h b/base/float_util.h
index 458e859..9027310 100644
--- a/base/float_util.h
+++ b/base/float_util.h
@@ -13,7 +13,8 @@
 
 namespace base {
 
-inline bool IsFinite(const double& number) {
+template <typename Float>
+inline bool IsFinite(const Float& number) {
 #if defined(OS_POSIX)
   return std::isfinite(number) != 0;
 #elif defined(OS_WIN)
@@ -21,6 +22,15 @@
 #endif
 }
 
+template <typename Float>
+inline bool IsNaN(const Float& number) {
+#if defined(OS_POSIX)
+  return std::isnan(number) != 0;
+#elif defined(OS_WIN)
+  return _isnan(number) != 0;
+#endif
+}
+
 }  // namespace base
 
 #endif  // BASE_FLOAT_UTIL_H_