Refactor base/safe_numerics.h

base/numerics/safe_numerics_unittest.cc

 // Copyright 2013 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 "base/safe_numerics.h"
+#include "base/numerics/safe_conversions.h"
 
 #include <stdint.h>
 
 #include <limits>
 
 #include "base/compiler_specific.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 namespace internal {
@@ skipping 235 matching lines @@
 #pragma warning(disable : 4756)
 #endif
 
   int small_positive = 1;
   int small_negative = -1;
   double double_small = 1.0;
   double double_large = std::numeric_limits<double>::max();
   double double_infinity = std::numeric_limits<float>::infinity();
 
   // Just test that the cast compiles, since the other tests cover logic.
-  EXPECT_EQ(0, base::checked_numeric_cast<int>(static_cast<size_t>(0)));
+  EXPECT_EQ(0, base::checked_cast<int>(static_cast<size_t>(0)));
 
   // Test various saturation corner cases.
   EXPECT_EQ(saturated_cast<int>(small_negative),
             static_cast<int>(small_negative));
   EXPECT_EQ(saturated_cast<int>(small_positive),
             static_cast<int>(small_positive));
   EXPECT_EQ(saturated_cast<unsigned>(small_negative),
             static_cast<unsigned>(0));
   EXPECT_EQ(saturated_cast<int>(double_small),
             static_cast<int>(double_small));
   EXPECT_EQ(saturated_cast<int>(double_large),
             std::numeric_limits<int>::max());
   EXPECT_EQ(saturated_cast<float>(double_large), double_infinity);
   EXPECT_EQ(saturated_cast<float>(-double_large), -double_infinity);
 }
 
 }  // namespace internal
 }  // namespace base