Wrap safe numerics library in namespace angle.

src/common/third_party/numerics/README.angle

@@ -10,7 +10,12 @@ License: Chromium
 License File: LICENSE in Chromium/src
 
 Description:
-base::numerics is a library for doing some simple safe math and conversions. To update the checkout, simply
-overwrite the base/numerics folder with Chromium's latest. The only modifications are to the base/logging.h
-file which defines CHECK to be ASSERT to be compatible with ANGLE.
+base::numerics is a library for doing some simple safe math and conversions.
+To update the checkout, simply overwrite the base/numerics folder with
+Chromium's latest.
 
+Modifications:
+
+- base/logging.h defines CHECK to be ASSERT to be compatible with ANGLE.
+- base/numerics/*.h uses namespace angle::base instead of base:: to avoid ODR
+  violations when ANGLE code is mixed with Chromium code.

src/common/third_party/numerics/base/numerics/safe_conversions.h

@@ -13,6 +13,9 @@
 #include "base/logging.h"
 #include "base/numerics/safe_conversions_impl.h"
 
+namespace angle
+{
+
 namespace base
 {
 
@@ -171,4 +174,6 @@ typedef StrictNumeric<size_t> SizeT;
 
 }  // namespace base
 
+}  // namespace angle
+
 #endif  // BASE_NUMERICS_SAFE_CONVERSIONS_H_

src/common/third_party/numerics/base/numerics/safe_conversions_impl.h

@@ -11,6 +11,9 @@
 #include <climits>
 #include <limits>
 
+namespace angle
+{
+
 namespace base
 {
 namespace internal
@@ -266,4 +269,6 @@ constexpr RangeConstraint DstRangeRelationToSrcRange(Src value)
 }  // namespace internal
 }  // namespace base
 
+}  // namespace angle
+
 #endif  // BASE_NUMERICS_SAFE_CONVERSIONS_IMPL_H_

src/common/third_party/numerics/base/numerics/safe_math.h

@@ -13,6 +13,9 @@
 #include "base/logging.h"
 #include "base/numerics/safe_math_impl.h"
 
+namespace angle
+{
+
 namespace base
 {
 
@@ -321,4 +324,6 @@ using internal::CheckedNumeric;
 
 }  // namespace base
 
+}  // namespace angle
+
 #endif  // BASE_NUMERICS_SAFE_MATH_H_

src/common/third_party/numerics/base/numerics/safe_math_impl.h

@@ -16,6 +16,9 @@
 
 #include "base/numerics/safe_conversions.h"
 
+namespace angle
+{
+
 namespace base
 {
 namespace internal
@@ -567,4 +570,6 @@ struct IsIntegerArithmeticSafe
 }  // namespace internal
 }  // namespace base
 
+}  // namespace angle
+
 #endif  // BASE_NUMERICS_SAFE_MATH_IMPL_H_