Move some numeric utility code from rtc_base/ to rtc_base/numerics/

Specifically, I'm moving

  safe_compare.h
  safe_conversions.h
  safe_minmax.h

They shouldn't be part of the API, and moving them to an appropriate
subdirectory of rtc_base/ is a good way to keep track of that.

BUG=webrtc:8445

Change-Id: I458531aeb30bcf4291c4bec3bf22a2fffbf054ff
Reviewed-on: https://webrtc-review.googlesource.com/20860
Commit-Queue: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20829}

api/audio_codecs/L16/audio_decoder_L16.cc

@@ -13,8 +13,8 @@
 #include "common_types.h"  // NOLINT(build/include)
 #include "modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h"
 #include "modules/audio_coding/codecs/pcm16b/pcm16b_common.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/ptr_util.h"
-#include "rtc_base/safe_conversions.h"
 
 namespace webrtc {
 

api/audio_codecs/L16/audio_encoder_L16.cc

@@ -13,8 +13,8 @@
 #include "common_types.h"  // NOLINT(build/include)
 #include "modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h"
 #include "modules/audio_coding/codecs/pcm16b/pcm16b_common.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/ptr_util.h"
-#include "rtc_base/safe_conversions.h"
 
 namespace webrtc {
 

api/audio_codecs/g711/audio_decoder_g711.cc

@@ -15,8 +15,8 @@
 
 #include "common_types.h"  // NOLINT(build/include)
 #include "modules/audio_coding/codecs/g711/audio_decoder_pcm.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/ptr_util.h"
-#include "rtc_base/safe_conversions.h"
 
 namespace webrtc {
 

api/audio_codecs/g711/audio_encoder_g711.cc

@@ -15,9 +15,9 @@
 
 #include "common_types.h"  // NOLINT(build/include)
 #include "modules/audio_coding/codecs/g711/audio_encoder_pcm.h"
+#include "rtc_base/numerics/safe_conversions.h"
+#include "rtc_base/numerics/safe_minmax.h"
 #include "rtc_base/ptr_util.h"
-#include "rtc_base/safe_conversions.h"
-#include "rtc_base/safe_minmax.h"
 #include "rtc_base/string_to_number.h"
 
 namespace webrtc {

api/audio_codecs/g722/audio_decoder_g722.cc

@@ -15,8 +15,8 @@
 
 #include "common_types.h"  // NOLINT(build/include)
 #include "modules/audio_coding/codecs/g722/audio_decoder_g722.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/ptr_util.h"
-#include "rtc_base/safe_conversions.h"
 
 namespace webrtc {
 

api/audio_codecs/g722/audio_encoder_g722.cc

@@ -15,9 +15,9 @@
 
 #include "common_types.h"  // NOLINT(build/include)
 #include "modules/audio_coding/codecs/g722/audio_encoder_g722.h"
+#include "rtc_base/numerics/safe_conversions.h"
+#include "rtc_base/numerics/safe_minmax.h"
 #include "rtc_base/ptr_util.h"
-#include "rtc_base/safe_conversions.h"
-#include "rtc_base/safe_minmax.h"
 #include "rtc_base/string_to_number.h"
 
 namespace webrtc {

api/audio_codecs/ilbc/audio_encoder_ilbc.cc

@@ -15,9 +15,9 @@
 
 #include "common_types.h"  // NOLINT(build/include)
 #include "modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h"
+#include "rtc_base/numerics/safe_conversions.h"
+#include "rtc_base/numerics/safe_minmax.h"
 #include "rtc_base/ptr_util.h"
-#include "rtc_base/safe_conversions.h"
-#include "rtc_base/safe_minmax.h"
 #include "rtc_base/string_to_number.h"
 
 namespace webrtc {

api/video/video_timing.h

@@ -17,7 +17,7 @@
 #include <string>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 
 namespace webrtc {
 

audio/test/audio_stats_test.cc

@@ -9,7 +9,7 @@
  */
 
 #include "audio/test/audio_end_to_end_test.h"
-#include "rtc_base/safe_compare.h"
+#include "rtc_base/numerics/safe_compare.h"
 #include "system_wrappers/include/sleep.h"
 #include "test/gtest.h"
 

audio/utility/audio_frame_operations.cc

@@ -14,7 +14,7 @@
 
 #include "modules/include/module_common_types.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 
 namespace webrtc {
 namespace {

call/rtp_demuxer_unittest.cc

@@ -23,8 +23,8 @@
 #include "rtc_base/arraysize.h"
 #include "rtc_base/basictypes.h"
 #include "rtc_base/checks.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/ptr_util.h"
-#include "rtc_base/safe_conversions.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
 

common_audio/audio_converter.cc

@@ -18,7 +18,7 @@
 #include "common_audio/channel_buffer.h"
 #include "common_audio/resampler/push_sinc_resampler.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 
 using rtc::checked_cast;
 

common_audio/signal_processing/dot_product_with_scale.cc

@@ -10,7 +10,7 @@
 
 #include "common_audio/signal_processing/dot_product_with_scale.h"
 
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 
 int32_t WebRtcSpl_DotProductWithScale(const int16_t* vector1,
                                       const int16_t* vector2,

common_audio/wav_file.cc

@@ -18,7 +18,7 @@
 #include "common_audio/include/audio_util.h"
 #include "common_audio/wav_header.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 
 namespace webrtc {
 

common_video/h264/sps_vui_rewriter.cc

@@ -18,7 +18,7 @@
 #include "rtc_base/bitbuffer.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/safe_minmax.h"
+#include "rtc_base/numerics/safe_minmax.h"
 
 #include "common_video/h264/h264_common.h"
 #include "common_video/h264/sps_parser.h"

logging/rtc_event_log/encoder/rtc_event_log_encoder_unittest.cc

@@ -41,9 +41,9 @@
 #include "modules/rtp_rtcp/source/rtp_packet_received.h"
 #include "modules/rtp_rtcp/source/rtp_packet_to_send.h"
 #include "rtc_base/arraysize.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/ptr_util.h"
 #include "rtc_base/random.h"
-#include "rtc_base/safe_conversions.h"
 #include "test/gtest.h"
 
 namespace webrtc {

logging/rtc_event_log/rtc_event_log.cc

@@ -26,9 +26,9 @@
 #include "rtc_base/constructormagic.h"
 #include "rtc_base/event.h"
 #include "rtc_base/logging.h"
+#include "rtc_base/numerics/safe_conversions.h"
+#include "rtc_base/numerics/safe_minmax.h"
 #include "rtc_base/ptr_util.h"
-#include "rtc_base/safe_conversions.h"
-#include "rtc_base/safe_minmax.h"
 #include "rtc_base/sequenced_task_checker.h"
 #include "rtc_base/task_queue.h"
 #include "rtc_base/thread_annotations.h"

media/engine/webrtcvideocapturer.cc

@@ -15,7 +15,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/criticalsection.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/thread.h"
 #include "rtc_base/timeutils.h"
 

media/engine/webrtcvoiceengine_unittest.cc

@@ -27,7 +27,7 @@
 #include "pc/channel.h"
 #include "rtc_base/arraysize.h"
 #include "rtc_base/byteorder.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "test/field_trial.h"
 #include "test/gtest.h"

media/sctp/sctptransport.cc

@@ -26,7 +26,6 @@ enum PreservedErrno {
 #include <memory>
 #include <sstream>
 
-#include "usrsctplib/usrsctp.h"
 #include "media/base/codec.h"
 #include "media/base/mediaconstants.h"
 #include "media/base/streamparams.h"
@@ -36,9 +35,10 @@ enum PreservedErrno {
 #include "rtc_base/criticalsection.h"
 #include "rtc_base/helpers.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/thread_checker.h"
 #include "rtc_base/trace_event.h"
+#include "usrsctplib/usrsctp.h"
 
 namespace {
 

modules/audio_coding/acm2/acm_receiver.cc

@@ -25,7 +25,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/format_macros.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "system_wrappers/include/clock.h"
 
 namespace webrtc {

modules/audio_coding/acm2/acm_receiver_unittest.cc

@@ -18,7 +18,7 @@
 #include "modules/audio_coding/include/audio_coding_module.h"
 #include "modules/audio_coding/neteq/tools/rtp_generator.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "system_wrappers/include/clock.h"
 #include "test/gtest.h"
 #include "test/testsupport/fileutils.h"

modules/audio_coding/acm2/audio_coding_module.cc

@@ -19,7 +19,7 @@
 #include "modules/audio_coding/acm2/rent_a_codec.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "system_wrappers/include/metrics.h"
 
 namespace webrtc {

modules/audio_coding/acm2/audio_coding_module_unittest.cc

@@ -35,9 +35,9 @@
 #include "modules/include/module_common_types.h"
 #include "rtc_base/criticalsection.h"
 #include "rtc_base/md5digest.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/platform_thread.h"
 #include "rtc_base/refcountedobject.h"
-#include "rtc_base/safe_conversions.h"
 #include "rtc_base/thread_annotations.h"
 #include "system_wrappers/include/clock.h"
 #include "system_wrappers/include/event_wrapper.h"

modules/audio_coding/audio_network_adaptor/bitrate_controller_unittest.cc

@@ -9,7 +9,7 @@
  */
 
 #include "modules/audio_coding/audio_network_adaptor/bitrate_controller.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "test/field_trial.h"
 #include "test/gtest.h"
 

modules/audio_coding/codecs/audio_format_conversion.cc

@@ -15,7 +15,7 @@
 #include "api/array_view.h"
 #include "api/optional.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/sanitizer.h"
 
 namespace webrtc {

modules/audio_coding/codecs/builtin_audio_encoder_factory_unittest.cc

@@ -13,7 +13,7 @@
 #include <vector>
 
 #include "api/audio_codecs/builtin_audio_encoder_factory.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
 

modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc

@@ -14,7 +14,7 @@
 #include "common_audio/vad/mock/mock_vad.h"
 #include "modules/audio_coding/codecs/cng/audio_encoder_cng.h"
 #include "rtc_base/constructormagic.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "test/gtest.h"
 #include "test/mock_audio_encoder.h"
 

modules/audio_coding/codecs/cng/webrtc_cng.cc

@@ -13,7 +13,7 @@
 #include <algorithm>
 
 #include "common_audio/signal_processing/include/signal_processing_library.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 
 namespace webrtc {
 

modules/audio_coding/codecs/g722/audio_encoder_g722.cc

@@ -16,7 +16,7 @@
 #include "common_types.h"  // NOLINT(build/include)
 #include "modules/audio_coding/codecs/g722/g722_interface.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 
 namespace webrtc {
 

modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc

@@ -15,7 +15,7 @@
 #include "common_types.h"  // NOLINT(build/include)
 #include "modules/audio_coding/codecs/ilbc/ilbc.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 
 namespace webrtc {
 

modules/audio_coding/codecs/isac/unittest.cc

@@ -17,7 +17,7 @@
 #include "modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h"
 #include "modules/audio_coding/neteq/tools/input_audio_file.h"
 #include "rtc_base/buffer.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "test/gtest.h"
 #include "test/testsupport/fileutils.h"
 

modules/audio_coding/codecs/legacy_encoded_audio_frame_unittest.cc

@@ -8,9 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "modules/audio_coding/acm2/rent_a_codec.h"
 #include "modules/audio_coding/codecs/legacy_encoded_audio_frame.h"
-#include "rtc_base/safe_conversions.h"
+
+#include "modules/audio_coding/acm2/rent_a_codec.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "test/gtest.h"
 
 namespace webrtc {

modules/audio_coding/codecs/opus/audio_encoder_opus.cc

@@ -22,10 +22,10 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/exp_filter.h"
+#include "rtc_base/numerics/safe_conversions.h"
+#include "rtc_base/numerics/safe_minmax.h"
 #include "rtc_base/protobuf_utils.h"
 #include "rtc_base/ptr_util.h"
-#include "rtc_base/safe_conversions.h"
-#include "rtc_base/safe_minmax.h"
 #include "rtc_base/string_to_number.h"
 #include "rtc_base/timeutils.h"
 #include "system_wrappers/include/field_trial.h"

modules/audio_coding/codecs/opus/opus_unittest.cc

@@ -15,7 +15,7 @@
 #include "modules/audio_coding/codecs/opus/opus_interface.h"
 #include "modules/audio_coding/neteq/tools/audio_loop.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "test/gtest.h"
 #include "test/testsupport/fileutils.h"
 

modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.cc

@@ -15,7 +15,7 @@
 #include "common_types.h"  // NOLINT(build/include)
 #include "modules/audio_coding/codecs/pcm16b/pcm16b.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 
 namespace webrtc {
 

modules/audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc

@@ -13,7 +13,7 @@
 
 #include "modules/audio_coding/codecs/red/audio_encoder_copy_red.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "test/gtest.h"
 #include "test/mock_audio_encoder.h"
 

modules/audio_coding/neteq/audio_multi_vector_unittest.cc

@@ -9,13 +9,13 @@
  */
 
 #include "modules/audio_coding/neteq/audio_multi_vector.h"
-#include "rtc_base/safe_conversions.h"
 
 #include <assert.h>
 #include <stdlib.h>
 
 #include <string>
 
+#include "rtc_base/numerics/safe_conversions.h"
 #include "test/gtest.h"
 #include "typedefs.h"  // NOLINT(build/include)
 

modules/audio_coding/neteq/audio_vector_unittest.cc

@@ -9,13 +9,13 @@
  */
 
 #include "modules/audio_coding/neteq/audio_vector.h"
-#include "rtc_base/safe_conversions.h"
 
 #include <assert.h>
 #include <stdlib.h>
 
 #include <string>
 
+#include "rtc_base/numerics/safe_conversions.h"
 #include "test/gtest.h"
 #include "typedefs.h"  // NOLINT(build/include)
 

modules/audio_coding/neteq/delay_manager.cc

@@ -20,7 +20,7 @@
 #include "modules/audio_coding/neteq/delay_peak_detector.h"
 #include "modules/include/module_common_types.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "system_wrappers/include/field_trial.h"
 
 namespace webrtc {

modules/audio_coding/neteq/delay_peak_detector.cc

@@ -13,7 +13,7 @@
 #include <algorithm>  // max
 
 #include "rtc_base/checks.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "system_wrappers/include/field_trial.h"
 
 namespace webrtc {

modules/audio_coding/neteq/expand.cc

@@ -23,7 +23,7 @@
 #include "modules/audio_coding/neteq/random_vector.h"
 #include "modules/audio_coding/neteq/statistics_calculator.h"
 #include "modules/audio_coding/neteq/sync_buffer.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 
 namespace webrtc {
 

modules/audio_coding/neteq/expand_unittest.cc

@@ -18,7 +18,7 @@
 #include "modules/audio_coding/neteq/statistics_calculator.h"
 #include "modules/audio_coding/neteq/sync_buffer.h"
 #include "modules/audio_coding/neteq/tools/resample_input_audio_file.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "test/gtest.h"
 #include "test/testsupport/fileutils.h"
 

modules/audio_coding/neteq/merge.cc

@@ -22,8 +22,8 @@
 #include "modules/audio_coding/neteq/dsp_helper.h"
 #include "modules/audio_coding/neteq/expand.h"
 #include "modules/audio_coding/neteq/sync_buffer.h"
-#include "rtc_base/safe_conversions.h"
-#include "rtc_base/safe_minmax.h"
+#include "rtc_base/numerics/safe_conversions.h"
+#include "rtc_base/numerics/safe_minmax.h"
 
 namespace webrtc {
 

modules/audio_coding/neteq/neteq_impl.cc

@@ -44,7 +44,7 @@
 #include "modules/include/module_common_types.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/sanitizer.h"
 #include "rtc_base/trace_event.h"
 #include "system_wrappers/include/field_trial.h"

modules/audio_coding/neteq/neteq_impl_unittest.cc

@@ -28,7 +28,7 @@
 #include "modules/audio_coding/neteq/sync_buffer.h"
 #include "modules/audio_coding/neteq/timestamp_scaler.h"
 #include "modules/include/module_common_types.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
 #include "test/mock_audio_decoder.h"

modules/audio_coding/neteq/neteq_unittest.cc

@@ -28,8 +28,8 @@
 #include "modules/include/module_common_types.h"
 #include "rtc_base/flags.h"
 #include "rtc_base/ignore_wundef.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/protobuf_utils.h"
-#include "rtc_base/safe_conversions.h"
 #include "rtc_base/sha1digest.h"
 #include "rtc_base/stringencode.h"
 #include "test/gtest.h"

modules/audio_coding/neteq/normal.h

@@ -19,7 +19,7 @@
 #include "modules/audio_coding/neteq/defines.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/constructormagic.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "typedefs.h"  // NOLINT(build/include)
 
 namespace webrtc {

modules/audio_coding/neteq/red_payload_splitter.cc

@@ -16,7 +16,7 @@
 #include "modules/audio_coding/neteq/decoder_database.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 
 namespace webrtc {
 

modules/audio_coding/neteq/red_payload_splitter_unittest.cc

@@ -20,7 +20,7 @@
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "modules/audio_coding/neteq/mock/mock_decoder_database.h"
 #include "modules/audio_coding/neteq/packet.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "test/gtest.h"
 #include "test/mock_audio_decoder_factory.h"
 

modules/audio_coding/neteq/statistics_calculator.cc

@@ -16,7 +16,7 @@
 
 #include "modules/audio_coding/neteq/delay_manager.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "system_wrappers/include/metrics.h"
 
 namespace webrtc {

modules/audio_coding/neteq/sync_buffer_unittest.cc

@@ -9,7 +9,7 @@
  */
 
 #include "modules/audio_coding/neteq/sync_buffer.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 
 #include "test/gtest.h"
 

modules/audio_coding/neteq/test/neteq_ilbc_quality_test.cc

@@ -14,7 +14,7 @@
 #include "modules/audio_coding/neteq/tools/neteq_quality_test.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/flags.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "test/testsupport/fileutils.h"
 
 using testing::InitGoogleTest;

modules/audio_coding/neteq/test/neteq_pcmu_quality_test.cc

@@ -14,7 +14,7 @@
 #include "modules/audio_coding/neteq/tools/neteq_quality_test.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/flags.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "test/testsupport/fileutils.h"
 
 using testing::InitGoogleTest;

modules/audio_coding/neteq/time_stretch.cc

@@ -17,7 +17,7 @@
 #include "modules/audio_coding/neteq/background_noise.h"
 #include "modules/audio_coding/neteq/cross_correlation.h"
 #include "modules/audio_coding/neteq/dsp_helper.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 
 namespace webrtc {
 

modules/audio_coding/neteq/tools/encode_neteq_input.cc

@@ -13,7 +13,7 @@
 #include <utility>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 
 namespace webrtc {
 namespace test {

modules/audio_coding/neteq/tools/fake_decode_from_file.cc

@@ -12,7 +12,7 @@
 
 #include "modules/rtp_rtcp/source/byte_io.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 
 namespace webrtc {
 namespace test {

modules/audio_coding/neteq/tools/input_audio_file_unittest.cc

@@ -11,7 +11,7 @@
 // Unit tests for test InputAudioFile class.
 
 #include "modules/audio_coding/neteq/tools/input_audio_file.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 
 #include "test/gtest.h"
 

modules/audio_device/audio_device_unittest.cc

@@ -21,8 +21,8 @@
 #include "rtc_base/criticalsection.h"
 #include "rtc_base/event.h"
 #include "rtc_base/logging.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/race_checker.h"
-#include "rtc_base/safe_conversions.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/thread_annotations.h"
 #include "rtc_base/thread_checker.h"

modules/audio_mixer/sine_wave_generator.cc

@@ -12,7 +12,7 @@
 
 #include <math.h>
 
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 
 namespace webrtc {
 

modules/audio_processing/aec/system_delay_unittest.cc

@@ -10,7 +10,7 @@
 
 #include "modules/audio_processing/aec/aec_core.h"
 #include "modules/audio_processing/aec/echo_cancellation.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "test/gtest.h"
 #include "typedefs.h"  // NOLINT(build/include)
 namespace webrtc {

modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc

@@ -26,8 +26,8 @@
 #include "modules/audio_processing/logging/apm_data_dumper.h"
 #include "modules/audio_processing/test/echo_canceller_test_tools.h"
 #include "rtc_base/arraysize.h"
+#include "rtc_base/numerics/safe_minmax.h"
 #include "rtc_base/random.h"
-#include "rtc_base/safe_minmax.h"
 #include "system_wrappers/include/cpu_features_wrapper.h"
 #include "test/gtest.h"
 

modules/audio_processing/aec3/echo_remover_metrics.cc

@@ -14,7 +14,7 @@
 #include <algorithm>
 #include <numeric>
 
-#include "rtc_base/safe_minmax.h"
+#include "rtc_base/numerics/safe_minmax.h"
 #include "system_wrappers/include/metrics.h"
 
 namespace webrtc {

modules/audio_processing/aec3/erle_estimator.cc

@@ -13,7 +13,7 @@
 #include <algorithm>
 #include <numeric>
 
-#include "rtc_base/safe_minmax.h"
+#include "rtc_base/numerics/safe_minmax.h"
 
 namespace webrtc {
 

modules/audio_processing/aec3/main_filter_update_gain_unittest.cc

@@ -22,8 +22,8 @@
 #include "modules/audio_processing/aec3/subtractor_output.h"
 #include "modules/audio_processing/logging/apm_data_dumper.h"
 #include "modules/audio_processing/test/echo_canceller_test_tools.h"
+#include "rtc_base/numerics/safe_minmax.h"
 #include "rtc_base/random.h"
-#include "rtc_base/safe_minmax.h"
 #include "test/gtest.h"
 
 namespace webrtc {

modules/audio_processing/aec3/shadow_filter_update_gain_unittest.cc

@@ -19,8 +19,8 @@
 #include "modules/audio_processing/aec3/aec3_common.h"
 #include "modules/audio_processing/aec3/aec_state.h"
 #include "modules/audio_processing/test/echo_canceller_test_tools.h"
+#include "rtc_base/numerics/safe_minmax.h"
 #include "rtc_base/random.h"
-#include "rtc_base/safe_minmax.h"
 #include "test/gtest.h"
 
 namespace webrtc {

modules/audio_processing/aec3/subtractor.cc

@@ -16,7 +16,7 @@
 #include "api/array_view.h"
 #include "modules/audio_processing/logging/apm_data_dumper.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/safe_minmax.h"
+#include "rtc_base/numerics/safe_minmax.h"
 
 namespace webrtc {
 

modules/audio_processing/aec3/suppression_filter.cc

@@ -17,7 +17,7 @@
 #include <numeric>
 
 #include "modules/audio_processing/utility/ooura_fft.h"
-#include "rtc_base/safe_minmax.h"
+#include "rtc_base/numerics/safe_minmax.h"
 
 namespace webrtc {
 namespace {

modules/audio_processing/aecm/aecm_core.cc

@@ -24,7 +24,7 @@ extern "C" {
 }
 
 #include "rtc_base/checks.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "typedefs.h"  // NOLINT(build/include)
 
 #ifdef AEC_DEBUG

modules/audio_processing/aecm/aecm_core_c.cc

@@ -24,7 +24,7 @@ extern "C" {
 }
 
 #include "rtc_base/checks.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/sanitizer.h"
 #include "typedefs.h"  // NOLINT(build/include)
 

modules/audio_processing/aecm/aecm_core_mips.cc

@@ -13,7 +13,7 @@
 #include "modules/audio_processing/aecm/echo_control_mobile.h"
 #include "modules/audio_processing/utility/delay_estimator_wrapper.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 
 static const ALIGN8_BEG int16_t WebRtcAecm_kSqrtHanning[] ALIGN8_END = {
   0, 399, 798, 1196, 1594, 1990, 2386, 2780, 3172,

modules/audio_processing/agc/agc_manager_direct.cc

@@ -21,7 +21,7 @@
 #include "modules/include/module_common_types.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/safe_minmax.h"
+#include "rtc_base/numerics/safe_minmax.h"
 #include "system_wrappers/include/metrics.h"
 
 namespace webrtc {

modules/audio_processing/agc2/gain_controller2.cc

@@ -16,7 +16,7 @@
 #include "modules/audio_processing/logging/apm_data_dumper.h"
 #include "rtc_base/atomicops.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/safe_minmax.h"
+#include "rtc_base/numerics/safe_minmax.h"
 
 namespace webrtc {
 

modules/audio_processing/audio_processing_performance_unittest.cc

@@ -19,9 +19,9 @@
 #include "modules/audio_processing/test/test_utils.h"
 #include "modules/include/module_common_types.h"
 #include "rtc_base/atomicops.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/platform_thread.h"
 #include "rtc_base/random.h"
-#include "rtc_base/safe_conversions.h"
 #include "system_wrappers/include/clock.h"
 #include "system_wrappers/include/event_wrapper.h"
 #include "test/gtest.h"

modules/audio_processing/audio_processing_unittest.cc

@@ -33,9 +33,9 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/gtest_prod_util.h"
 #include "rtc_base/ignore_wundef.h"
+#include "rtc_base/numerics/safe_minmax.h"
 #include "rtc_base/protobuf_utils.h"
 #include "rtc_base/refcountedobject.h"
-#include "rtc_base/safe_minmax.h"
 #include "rtc_base/task_queue.h"
 #include "rtc_base/thread.h"
 #include "system_wrappers/include/event_wrapper.h"

modules/audio_processing/intelligibility/intelligibility_enhancer.cc

@@ -20,7 +20,7 @@
 #include "common_audio/window_generator.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/safe_minmax.h"
+#include "rtc_base/numerics/safe_minmax.h"
 
 namespace webrtc {
 

modules/audio_processing/intelligibility/intelligibility_utils.cc

@@ -16,7 +16,7 @@
 #include <algorithm>
 #include <limits>
 
-#include "rtc_base/safe_minmax.h"
+#include "rtc_base/numerics/safe_minmax.h"
 
 namespace webrtc {
 

modules/audio_processing/rms_level_unittest.cc

@@ -15,7 +15,7 @@
 #include "modules/audio_processing/rms_level.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/mathutils.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "test/gtest.h"
 
 namespace webrtc {

modules/congestion_controller/probe_controller.cc

@@ -14,7 +14,7 @@
 #include <initializer_list>
 
 #include "rtc_base/logging.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "system_wrappers/include/field_trial.h"
 #include "system_wrappers/include/metrics.h"
 

modules/congestion_controller/transport_feedback_adapter_unittest.cc

@@ -18,7 +18,7 @@
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "system_wrappers/include/clock.h"
 #include "test/gmock.h"
 #include "test/gtest.h"

modules/include/module_common_types.h

@@ -26,7 +26,7 @@
 #include "modules/video_coding/codecs/vp9/include/vp9_globals.h"
 #include "rtc_base/constructormagic.h"
 #include "rtc_base/deprecation.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/timeutils.h"
 #include "typedefs.h"  // NOLINT(build/include)
 

modules/remote_bitrate_estimator/aimd_rate_control.cc

@@ -16,7 +16,7 @@
 #include <string>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/safe_minmax.h"
+#include "rtc_base/numerics/safe_minmax.h"
 
 #include "modules/remote_bitrate_estimator/include/bwe_defines.h"
 #include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"

modules/remote_bitrate_estimator/overuse_detector.cc

@@ -21,7 +21,7 @@
 #include "modules/remote_bitrate_estimator/test/bwe_test_logging.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/safe_minmax.h"
+#include "rtc_base/numerics/safe_minmax.h"
 #include "system_wrappers/include/field_trial.h"
 
 namespace webrtc {

modules/remote_bitrate_estimator/remote_estimator_proxy.cc

@@ -16,7 +16,7 @@
 #include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/safe_minmax.h"
+#include "rtc_base/numerics/safe_minmax.h"
 #include "system_wrappers/include/clock.h"
 
 namespace webrtc {

modules/remote_bitrate_estimator/test/bwe_test_framework.cc

@@ -15,7 +15,7 @@
 #include <sstream>
 
 #include "rtc_base/constructormagic.h"
-#include "rtc_base/safe_minmax.h"
+#include "rtc_base/numerics/safe_minmax.h"
 
 namespace webrtc {
 namespace testing {

modules/rtp_rtcp/source/rtcp_packet/dlrr.cc

@@ -13,7 +13,7 @@
 #include "modules/rtp_rtcp/source/byte_io.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 
 namespace webrtc {
 namespace rtcp {

modules/rtp_rtcp/source/rtcp_packet/target_bitrate.cc

@@ -12,7 +12,7 @@
 
 #include "modules/rtp_rtcp/source/byte_io.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 
 namespace webrtc {
 namespace rtcp {

modules/rtp_rtcp/source/rtp_packet.cc

@@ -18,8 +18,8 @@
 #include "modules/rtp_rtcp/source/byte_io.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/random.h"
-#include "rtc_base/safe_conversions.h"
 
 namespace webrtc {
 namespace {

modules/rtp_rtcp/source/rtp_packet_received.cc

@@ -13,7 +13,7 @@
 #include <vector>
 
 #include "modules/rtp_rtcp/source/rtp_header_extensions.h"
-#include "rtc_base/safe_conversions.h"
+#include "rtc_base/numerics/safe_conversions.h"
 
 namespace webrtc {
 

modules/rtp_rtcp/source/rtp_sender.cc

@@ -27,9 +27,9 @@
 #include "rtc_base/arraysize.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
+#include "rtc_base/numerics/safe_minmax.h"
 #include "rtc_base/ptr_util.h"
 #include "rtc_base/rate_limiter.h"
-#include "rtc_base/safe_minmax.h"
 #include "rtc_base/timeutils.h"
 #include "rtc_base/trace_event.h"
 #include "system_wrappers/include/field_trial.h"

p2p/base/port.cc

@@ -24,8 +24,8 @@
 #include "rtc_base/logging.h"
 #include "rtc_base/messagedigest.h"
 #include "rtc_base/network.h"
+#include "rtc_base/numerics/safe_minmax.h"
 #include "rtc_base/ptr_util.h"
-#include "rtc_base/safe_minmax.h"
 #include "rtc_base/stringencode.h"
 #include "rtc_base/stringutils.h"
 

p2p/base/pseudotcp.cc

@@ -23,7 +23,7 @@
 #include "rtc_base/byteorder.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/safe_minmax.h"
+#include "rtc_base/numerics/safe_minmax.h"
 #include "rtc_base/socket.h"
 #include "rtc_base/stringutils.h"
 #include "rtc_base/timeutils.h"

pc/peerconnection.cc

@@ -40,8 +40,8 @@
 #include "rtc_base/bind.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
+#include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/ptr_util.h"
-#include "rtc_base/safe_conversions.h"
 #include "rtc_base/stringencode.h"
 #include "rtc_base/stringutils.h"
 #include "rtc_base/trace_event.h"

rtc_base/BUILD.gn

@@ -146,6 +146,10 @@ rtc_source_set("rtc_base_approved_generic") {
     "location.h",
     "mod_ops.h",
     "moving_max_counter.h",
+    "numerics/safe_compare.h",
+    "numerics/safe_conversions.h",
+    "numerics/safe_conversions_impl.h",
+    "numerics/safe_minmax.h",
     "onetimeevent.h",
     "pathutils.cc",
     "pathutils.h",
@@ -168,10 +172,6 @@ rtc_source_set("rtc_base_approved_generic") {
     "refcount.h",
     "refcountedobject.h",
     "refcounter.h",
-    "safe_compare.h",
-    "safe_conversions.h",
-    "safe_conversions_impl.h",
-    "safe_minmax.h",
     "sanitizer.h",
     "scoped_ref_ptr.h",
     "string_to_number.cc",
@@ -875,6 +875,8 @@ if (rtc_include_tests) {
       "md5digest_unittest.cc",
       "mod_ops_unittest.cc",
       "moving_max_counter_unittest.cc",
+      "numerics/safe_compare_unittest.cc",
+      "numerics/safe_minmax_unittest.cc",
       "onetimeevent_unittest.cc",
       "pathutils_unittest.cc",
       "platform_thread_unittest.cc",
@@ -883,8 +885,6 @@ if (rtc_include_tests) {
       "rate_statistics_unittest.cc",
       "ratetracker_unittest.cc",
       "refcountedobject_unittest.cc",
-      "safe_compare_unittest.cc",
-      "safe_minmax_unittest.cc",
       "string_to_number_unittest.cc",
       "stringencode_unittest.cc",
       "stringize_macros_unittest.cc",

rtc_base/checks.h

@@ -36,7 +36,7 @@ NO_RETURN void rtc_FatalMessage(const char* file, int line, const char* msg);
 #include <sstream>
 #include <string>
 
-#include "rtc_base/safe_compare.h"
+#include "rtc_base/numerics/safe_compare.h"
 
 // The macros here print a message to stderr and abort under various
 // conditions. All will accept additional stream messages. For example:

rtc_base/numerics/safe_compare.h

@@ -28,8 +28,8 @@
 // zero; in the remaining cases, it is just a few machine instructions (no
 // branches).
 
-#ifndef RTC_BASE_SAFE_COMPARE_H_
-#define RTC_BASE_SAFE_COMPARE_H_
+#ifndef RTC_BASE_NUMERICS_SAFE_COMPARE_H_
+#define RTC_BASE_NUMERICS_SAFE_COMPARE_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -173,4 +173,4 @@ RTC_SAFECMP_MAKE_FUN(Ge)
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_SAFE_COMPARE_H_
+#endif  // RTC_BASE_NUMERICS_SAFE_COMPARE_H_

rtc_base/numerics/safe_compare_unittest.cc

@@ -10,7 +10,7 @@
 
 #include <limits>
 
-#include "rtc_base/safe_compare.h"
+#include "rtc_base/numerics/safe_compare.h"
 #include "test/gtest.h"
 
 namespace rtc {

rtc_base/numerics/safe_conversions.h

@@ -10,13 +10,13 @@
 
 // Borrowed from Chromium's src/base/numerics/safe_conversions.h.
 
-#ifndef RTC_BASE_SAFE_CONVERSIONS_H_
-#define RTC_BASE_SAFE_CONVERSIONS_H_
+#ifndef RTC_BASE_NUMERICS_SAFE_CONVERSIONS_H_
+#define RTC_BASE_NUMERICS_SAFE_CONVERSIONS_H_
 
 #include <limits>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/safe_conversions_impl.h"
+#include "rtc_base/numerics/safe_conversions_impl.h"
 
 namespace rtc {
 
@@ -73,4 +73,4 @@ inline Dst saturated_cast(Src value) {
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_SAFE_CONVERSIONS_H_
+#endif  // RTC_BASE_NUMERICS_SAFE_CONVERSIONS_H_

rtc_base/numerics/safe_conversions_impl.h

@@ -10,8 +10,8 @@
 
 // Borrowed from Chromium's src/base/numerics/safe_conversions_impl.h.
 
-#ifndef RTC_BASE_SAFE_CONVERSIONS_IMPL_H_
-#define RTC_BASE_SAFE_CONVERSIONS_IMPL_H_
+#ifndef RTC_BASE_NUMERICS_SAFE_CONVERSIONS_IMPL_H_
+#define RTC_BASE_NUMERICS_SAFE_CONVERSIONS_IMPL_H_
 
 #include <limits>
 
@@ -172,4 +172,4 @@ inline RangeCheckResult RangeCheck(Src value) {
 }  // namespace internal
 }  // namespace rtc
 
-#endif  // RTC_BASE_SAFE_CONVERSIONS_IMPL_H_
+#endif  // RTC_BASE_NUMERICS_SAFE_CONVERSIONS_IMPL_H_

rtc_base/numerics/safe_minmax.h

@@ -73,14 +73,14 @@
 // result, then everything's fine, and the return type is as requested. But if
 // the requested type is too small, a static_assert is triggered.
 
-#ifndef RTC_BASE_SAFE_MINMAX_H_
-#define RTC_BASE_SAFE_MINMAX_H_
+#ifndef RTC_BASE_NUMERICS_SAFE_MINMAX_H_
+#define RTC_BASE_NUMERICS_SAFE_MINMAX_H_
 
 #include <limits>
 #include <type_traits>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/safe_compare.h"
+#include "rtc_base/numerics/safe_compare.h"
 #include "rtc_base/type_traits.h"
 
 namespace rtc {
@@ -332,4 +332,4 @@ R2 SafeClamp(T x, L min, H max) {
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_SAFE_MINMAX_H_
+#endif  // RTC_BASE_NUMERICS_SAFE_MINMAX_H_