diff --git a/talk/app/webrtc/java/jni/androidmediacodeccommon.h b/talk/app/webrtc/java/jni/androidmediacodeccommon.h index 33c5a6d3c0..cd1a732d83 100644 --- a/talk/app/webrtc/java/jni/androidmediacodeccommon.h +++ b/talk/app/webrtc/java/jni/androidmediacodeccommon.h @@ -33,7 +33,7 @@ #include "talk/app/webrtc/java/jni/classreferenceholder.h" #include "webrtc/base/thread.h" #include "webrtc/base/logging.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/tick_util.h" namespace webrtc_jni { diff --git a/talk/app/webrtc/java/jni/androidmediadecoder_jni.cc b/talk/app/webrtc/java/jni/androidmediadecoder_jni.cc index 618c119371..dc74c1ff78 100644 --- a/talk/app/webrtc/java/jni/androidmediadecoder_jni.cc +++ b/talk/app/webrtc/java/jni/androidmediadecoder_jni.cc @@ -41,8 +41,8 @@ #include "webrtc/base/timeutils.h" #include "webrtc/common_video/interface/i420_buffer_pool.h" #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" -#include "webrtc/system_wrappers/interface/logcat_trace_context.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/logcat_trace_context.h" +#include "webrtc/system_wrappers/include/tick_util.h" #include "third_party/libyuv/include/libyuv/convert.h" #include "third_party/libyuv/include/libyuv/convert_from.h" #include "third_party/libyuv/include/libyuv/video_common.h" diff --git a/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc b/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc index a69db8b805..b0a64333c7 100644 --- a/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc +++ b/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc @@ -37,8 +37,8 @@ #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" #include "webrtc/modules/video_coding/utility/include/quality_scaler.h" #include "webrtc/modules/video_coding/utility/include/vp8_header_parser.h" -#include "webrtc/system_wrappers/interface/field_trial.h" -#include "webrtc/system_wrappers/interface/logcat_trace_context.h" +#include "webrtc/system_wrappers/include/field_trial.h" +#include "webrtc/system_wrappers/include/logcat_trace_context.h" #include "third_party/libyuv/include/libyuv/convert.h" #include "third_party/libyuv/include/libyuv/convert_from.h" #include "third_party/libyuv/include/libyuv/video_common.h" diff --git a/talk/app/webrtc/java/jni/peerconnection_jni.cc b/talk/app/webrtc/java/jni/peerconnection_jni.cc index 1db8621725..e75cd553b6 100644 --- a/talk/app/webrtc/java/jni/peerconnection_jni.cc +++ b/talk/app/webrtc/java/jni/peerconnection_jni.cc @@ -80,8 +80,8 @@ #include "webrtc/base/messagequeue.h" #include "webrtc/base/ssladapter.h" #include "webrtc/base/stringutils.h" -#include "webrtc/system_wrappers/interface/field_trial_default.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/field_trial_default.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/voice_engine/include/voe_base.h" #if defined(ANDROID) && !defined(WEBRTC_CHROMIUM_BUILD) @@ -91,7 +91,7 @@ #include "talk/app/webrtc/java/jni/androidvideocapturer_jni.h" #include "talk/app/webrtc/java/jni/androidnetworkmonitor_jni.h" #include "webrtc/modules/video_render/video_render_internal.h" -#include "webrtc/system_wrappers/interface/logcat_trace_context.h" +#include "webrtc/system_wrappers/include/logcat_trace_context.h" using webrtc::LogcatTraceContext; #endif diff --git a/talk/app/webrtc/peerconnection.cc b/talk/app/webrtc/peerconnection.cc index fecc19ba0e..0d519b280b 100644 --- a/talk/app/webrtc/peerconnection.cc +++ b/talk/app/webrtc/peerconnection.cc @@ -51,7 +51,7 @@ #include "webrtc/base/logging.h" #include "webrtc/base/stringencode.h" #include "webrtc/base/stringutils.h" -#include "webrtc/system_wrappers/interface/field_trial.h" +#include "webrtc/system_wrappers/include/field_trial.h" namespace { diff --git a/talk/media/devices/yuvframescapturer.cc b/talk/media/devices/yuvframescapturer.cc index dc91cc8411..a60ad0270a 100644 --- a/talk/media/devices/yuvframescapturer.cc +++ b/talk/media/devices/yuvframescapturer.cc @@ -32,7 +32,7 @@ #include "webrtc/base/logging.h" #include "webrtc/base/thread.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" namespace cricket { /////////////////////////////////////////////////////////////////////// diff --git a/talk/media/webrtc/simulcast.cc b/talk/media/webrtc/simulcast.cc index a837b7ccb7..f55d9606a5 100755 --- a/talk/media/webrtc/simulcast.cc +++ b/talk/media/webrtc/simulcast.cc @@ -31,7 +31,7 @@ #include "talk/media/webrtc/simulcast.h" #include "webrtc/base/common.h" #include "webrtc/base/logging.h" -#include "webrtc/system_wrappers/interface/field_trial.h" +#include "webrtc/system_wrappers/include/field_trial.h" namespace cricket { struct SimulcastFormat { diff --git a/talk/media/webrtc/webrtcvideocapturer.cc b/talk/media/webrtc/webrtcvideocapturer.cc index 5ba5fb9ba2..7d72128d61 100644 --- a/talk/media/webrtc/webrtcvideocapturer.cc +++ b/talk/media/webrtc/webrtcvideocapturer.cc @@ -44,7 +44,7 @@ #include "webrtc/base/win32.h" // Need this to #include the impl files. #include "webrtc/modules/video_capture/include/video_capture_factory.h" -#include "webrtc/system_wrappers/interface/field_trial.h" +#include "webrtc/system_wrappers/include/field_trial.h" namespace cricket { diff --git a/talk/media/webrtc/webrtcvideoengine2.cc b/talk/media/webrtc/webrtcvideoengine2.cc index 2f85ed2893..ed75c0d427 100644 --- a/talk/media/webrtc/webrtcvideoengine2.cc +++ b/talk/media/webrtc/webrtcvideoengine2.cc @@ -47,7 +47,7 @@ #include "webrtc/call.h" #include "webrtc/modules/video_coding/codecs/h264/include/h264.h" #include "webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h" -#include "webrtc/system_wrappers/interface/field_trial.h" +#include "webrtc/system_wrappers/include/field_trial.h" #include "webrtc/video_decoder.h" #include "webrtc/video_encoder.h" diff --git a/talk/media/webrtc/webrtcvoiceengine.cc b/talk/media/webrtc/webrtcvoiceengine.cc index 1d12fbf2ff..27ca1deb2d 100644 --- a/talk/media/webrtc/webrtcvoiceengine.cc +++ b/talk/media/webrtc/webrtcvoiceengine.cc @@ -53,7 +53,7 @@ #include "webrtc/call/rtc_event_log.h" #include "webrtc/common.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/system_wrappers/interface/field_trial.h" +#include "webrtc/system_wrappers/include/field_trial.h" namespace cricket { namespace { diff --git a/webrtc/audio/audio_receive_stream.cc b/webrtc/audio/audio_receive_stream.cc index b3cacba430..34197c3ff7 100644 --- a/webrtc/audio/audio_receive_stream.cc +++ b/webrtc/audio/audio_receive_stream.cc @@ -16,7 +16,7 @@ #include "webrtc/base/checks.h" #include "webrtc/base/logging.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/tick_util.h" #include "webrtc/voice_engine/include/voe_base.h" #include "webrtc/voice_engine/include/voe_codec.h" #include "webrtc/voice_engine/include/voe_neteq_stats.h" diff --git a/webrtc/base/event_tracer_unittest.cc b/webrtc/base/event_tracer_unittest.cc index 897f99efa1..c1b86f2fd8 100644 --- a/webrtc/base/event_tracer_unittest.cc +++ b/webrtc/base/event_tracer_unittest.cc @@ -12,7 +12,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/base/trace_event.h" -#include "webrtc/system_wrappers/interface/static_instance.h" +#include "webrtc/system_wrappers/include/static_instance.h" namespace { diff --git a/webrtc/call/bitrate_estimator_tests.cc b/webrtc/call/bitrate_estimator_tests.cc index e327c59d9e..685f3fd665 100644 --- a/webrtc/call/bitrate_estimator_tests.cc +++ b/webrtc/call/bitrate_estimator_tests.cc @@ -17,9 +17,9 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/thread_annotations.h" #include "webrtc/call.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/call_test.h" #include "webrtc/test/direct_transport.h" #include "webrtc/test/encoder_settings.h" diff --git a/webrtc/call/call.cc b/webrtc/call/call.cc index 7bb22af125..594ddf5c97 100644 --- a/webrtc/call/call.cc +++ b/webrtc/call/call.cc @@ -28,11 +28,11 @@ #include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/utility/interface/process_thread.h" -#include "webrtc/system_wrappers/interface/cpu_info.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/logging.h" -#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/cpu_info.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/logging.h" +#include "webrtc/system_wrappers/include/rw_lock_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/video/video_receive_stream.h" #include "webrtc/video/video_send_stream.h" #include "webrtc/video_engine/call_stats.h" diff --git a/webrtc/call/call_perf_tests.cc b/webrtc/call/call_perf_tests.cc index d9edac802e..3676b800c5 100644 --- a/webrtc/call/call_perf_tests.cc +++ b/webrtc/call/call_perf_tests.cc @@ -21,8 +21,8 @@ #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/rtp_to_ntp.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/rtp_to_ntp.h" #include "webrtc/test/call_test.h" #include "webrtc/test/direct_transport.h" #include "webrtc/test/encoder_settings.h" diff --git a/webrtc/call/congestion_controller.cc b/webrtc/call/congestion_controller.cc index 0c8058bbb7..1ec361e898 100644 --- a/webrtc/call/congestion_controller.cc +++ b/webrtc/call/congestion_controller.cc @@ -22,8 +22,8 @@ #include "webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h" #include "webrtc/modules/utility/interface/process_thread.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/logging.h" #include "webrtc/video_engine/call_stats.h" #include "webrtc/video_engine/payload_router.h" #include "webrtc/video_engine/vie_encoder.h" diff --git a/webrtc/call/rtc_event_log.cc b/webrtc/call/rtc_event_log.cc index dd7a3b661b..550b556e80 100644 --- a/webrtc/call/rtc_event_log.cc +++ b/webrtc/call/rtc_event_log.cc @@ -18,8 +18,8 @@ #include "webrtc/base/thread_annotations.h" #include "webrtc/call.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/system_wrappers/interface/clock.h" -#include "webrtc/system_wrappers/interface/file_wrapper.h" +#include "webrtc/system_wrappers/include/clock.h" +#include "webrtc/system_wrappers/include/file_wrapper.h" #ifdef ENABLE_RTC_EVENT_LOG // Files generated at build-time by the protobuf compiler. diff --git a/webrtc/call/rtc_event_log_unittest.cc b/webrtc/call/rtc_event_log_unittest.cc index cae2a202e0..a4fdd13512 100644 --- a/webrtc/call/rtc_event_log_unittest.cc +++ b/webrtc/call/rtc_event_log_unittest.cc @@ -22,7 +22,7 @@ #include "webrtc/call.h" #include "webrtc/call/rtc_event_log.h" #include "webrtc/modules/rtp_rtcp/source/rtp_sender.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" #include "webrtc/test/test_suite.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/gtest_disable.h" diff --git a/webrtc/call/transport_adapter.h b/webrtc/call/transport_adapter.h index 72f9baabcf..583cdf9585 100644 --- a/webrtc/call/transport_adapter.h +++ b/webrtc/call/transport_adapter.h @@ -11,7 +11,7 @@ #define WEBRTC_CALL_TRANSPORT_ADAPTER_H_ #include "webrtc/common_types.h" -#include "webrtc/system_wrappers/interface/atomic32.h" +#include "webrtc/system_wrappers/include/atomic32.h" #include "webrtc/transport.h" namespace webrtc { diff --git a/webrtc/common_audio/audio_converter.cc b/webrtc/common_audio/audio_converter.cc index 07e5c6bdac..f1709ae653 100644 --- a/webrtc/common_audio/audio_converter.cc +++ b/webrtc/common_audio/audio_converter.cc @@ -16,7 +16,7 @@ #include "webrtc/base/safe_conversions.h" #include "webrtc/common_audio/channel_buffer.h" #include "webrtc/common_audio/resampler/push_sinc_resampler.h" -#include "webrtc/system_wrappers/interface/scoped_vector.h" +#include "webrtc/system_wrappers/include/scoped_vector.h" using rtc::checked_cast; diff --git a/webrtc/common_audio/fir_filter.cc b/webrtc/common_audio/fir_filter.cc index 1c5548dcdc..dc1b776f99 100644 --- a/webrtc/common_audio/fir_filter.cc +++ b/webrtc/common_audio/fir_filter.cc @@ -16,7 +16,7 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/common_audio/fir_filter_neon.h" #include "webrtc/common_audio/fir_filter_sse.h" -#include "webrtc/system_wrappers/interface/cpu_features_wrapper.h" +#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" namespace webrtc { diff --git a/webrtc/common_audio/fir_filter_neon.cc b/webrtc/common_audio/fir_filter_neon.cc index 97a75db0f2..a81562655b 100644 --- a/webrtc/common_audio/fir_filter_neon.cc +++ b/webrtc/common_audio/fir_filter_neon.cc @@ -14,7 +14,7 @@ #include #include -#include "webrtc/system_wrappers/interface/aligned_malloc.h" +#include "webrtc/system_wrappers/include/aligned_malloc.h" namespace webrtc { diff --git a/webrtc/common_audio/fir_filter_neon.h b/webrtc/common_audio/fir_filter_neon.h index d7399ad977..3aa6168dd2 100644 --- a/webrtc/common_audio/fir_filter_neon.h +++ b/webrtc/common_audio/fir_filter_neon.h @@ -13,7 +13,7 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/common_audio/fir_filter.h" -#include "webrtc/system_wrappers/interface/aligned_malloc.h" +#include "webrtc/system_wrappers/include/aligned_malloc.h" namespace webrtc { diff --git a/webrtc/common_audio/fir_filter_sse.cc b/webrtc/common_audio/fir_filter_sse.cc index 6e7ae70e3f..adbb2b75cc 100644 --- a/webrtc/common_audio/fir_filter_sse.cc +++ b/webrtc/common_audio/fir_filter_sse.cc @@ -14,7 +14,7 @@ #include #include -#include "webrtc/system_wrappers/interface/aligned_malloc.h" +#include "webrtc/system_wrappers/include/aligned_malloc.h" namespace webrtc { diff --git a/webrtc/common_audio/fir_filter_sse.h b/webrtc/common_audio/fir_filter_sse.h index d3968310b8..a3325cd01d 100644 --- a/webrtc/common_audio/fir_filter_sse.h +++ b/webrtc/common_audio/fir_filter_sse.h @@ -13,7 +13,7 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/common_audio/fir_filter.h" -#include "webrtc/system_wrappers/interface/aligned_malloc.h" +#include "webrtc/system_wrappers/include/aligned_malloc.h" namespace webrtc { diff --git a/webrtc/common_audio/lapped_transform.h b/webrtc/common_audio/lapped_transform.h index 75af186ab6..21e10e3911 100644 --- a/webrtc/common_audio/lapped_transform.h +++ b/webrtc/common_audio/lapped_transform.h @@ -16,7 +16,7 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/common_audio/blocker.h" #include "webrtc/common_audio/real_fourier.h" -#include "webrtc/system_wrappers/interface/aligned_array.h" +#include "webrtc/system_wrappers/include/aligned_array.h" namespace webrtc { diff --git a/webrtc/common_audio/real_fourier.h b/webrtc/common_audio/real_fourier.h index ef4fec871e..ce3bbff679 100644 --- a/webrtc/common_audio/real_fourier.h +++ b/webrtc/common_audio/real_fourier.h @@ -14,7 +14,7 @@ #include #include "webrtc/base/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/aligned_malloc.h" +#include "webrtc/system_wrappers/include/aligned_malloc.h" // Uniform interface class for the real DFT and its inverse, for power-of-2 // input lengths. Also contains helper functions for buffer allocation, taking diff --git a/webrtc/common_audio/resampler/push_sinc_resampler_unittest.cc b/webrtc/common_audio/resampler/push_sinc_resampler_unittest.cc index a7e9715365..17e3dba1e2 100644 --- a/webrtc/common_audio/resampler/push_sinc_resampler_unittest.cc +++ b/webrtc/common_audio/resampler/push_sinc_resampler_unittest.cc @@ -17,7 +17,7 @@ #include "webrtc/common_audio/include/audio_util.h" #include "webrtc/common_audio/resampler/push_sinc_resampler.h" #include "webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/tick_util.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/common_audio/resampler/sinc_resampler.cc b/webrtc/common_audio/resampler/sinc_resampler.cc index c4f1488b25..69ac2208cf 100644 --- a/webrtc/common_audio/resampler/sinc_resampler.cc +++ b/webrtc/common_audio/resampler/sinc_resampler.cc @@ -93,7 +93,7 @@ #include -#include "webrtc/system_wrappers/interface/cpu_features_wrapper.h" +#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/common_audio/resampler/sinc_resampler.h b/webrtc/common_audio/resampler/sinc_resampler.h index 189112bf54..45ade0cc69 100644 --- a/webrtc/common_audio/resampler/sinc_resampler.h +++ b/webrtc/common_audio/resampler/sinc_resampler.h @@ -16,7 +16,7 @@ #include "webrtc/base/constructormagic.h" #include "webrtc/base/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/aligned_malloc.h" +#include "webrtc/system_wrappers/include/aligned_malloc.h" #include "webrtc/test/testsupport/gtest_prod_util.h" #include "webrtc/typedefs.h" diff --git a/webrtc/common_audio/resampler/sinc_resampler_unittest.cc b/webrtc/common_audio/resampler/sinc_resampler_unittest.cc index 206a1741d4..b8d6c341a2 100644 --- a/webrtc/common_audio/resampler/sinc_resampler_unittest.cc +++ b/webrtc/common_audio/resampler/sinc_resampler_unittest.cc @@ -21,9 +21,9 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/common_audio/resampler/sinc_resampler.h" #include "webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h" -#include "webrtc/system_wrappers/interface/cpu_features_wrapper.h" -#include "webrtc/system_wrappers/interface/stringize_macros.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" +#include "webrtc/system_wrappers/include/stringize_macros.h" +#include "webrtc/system_wrappers/include/tick_util.h" #include "webrtc/test/test_suite.h" using testing::_; diff --git a/webrtc/common_audio/signal_processing/complex_bit_reverse_arm.S b/webrtc/common_audio/signal_processing/complex_bit_reverse_arm.S index e7f8a819bd..93de99f51b 100644 --- a/webrtc/common_audio/signal_processing/complex_bit_reverse_arm.S +++ b/webrtc/common_audio/signal_processing/complex_bit_reverse_arm.S @@ -12,7 +12,7 @@ @ for ARMv5 platforms. @ Reference C code is in file complex_bit_reverse.c. Bit-exact. -#include "webrtc/system_wrappers/interface/asm_defines.h" +#include "webrtc/system_wrappers/include/asm_defines.h" GLOBAL_FUNCTION WebRtcSpl_ComplexBitReverse .align 2 diff --git a/webrtc/common_audio/signal_processing/filter_ar_fast_q12_armv7.S b/webrtc/common_audio/signal_processing/filter_ar_fast_q12_armv7.S index 76c8eee7fa..f16362738a 100644 --- a/webrtc/common_audio/signal_processing/filter_ar_fast_q12_armv7.S +++ b/webrtc/common_audio/signal_processing/filter_ar_fast_q12_armv7.S @@ -35,7 +35,7 @@ @ r11: Scratch @ r12: &coefficients[j] -#include "webrtc/system_wrappers/interface/asm_defines.h" +#include "webrtc/system_wrappers/include/asm_defines.h" GLOBAL_FUNCTION WebRtcSpl_FilterARFastQ12 .align 2 diff --git a/webrtc/common_audio/signal_processing/spl_init.c b/webrtc/common_audio/signal_processing/spl_init.c index 73c2039eae..fdab038399 100644 --- a/webrtc/common_audio/signal_processing/spl_init.c +++ b/webrtc/common_audio/signal_processing/spl_init.c @@ -15,7 +15,7 @@ */ #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/system_wrappers/interface/cpu_features_wrapper.h" +#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" /* Declare function pointers. */ MaxAbsValueW16 WebRtcSpl_MaxAbsValueW16; diff --git a/webrtc/common_audio/signal_processing/spl_sqrt_floor_arm.S b/webrtc/common_audio/signal_processing/spl_sqrt_floor_arm.S index f44ddd464c..72cd2d9a0a 100644 --- a/webrtc/common_audio/signal_processing/spl_sqrt_floor_arm.S +++ b/webrtc/common_audio/signal_processing/spl_sqrt_floor_arm.S @@ -32,7 +32,7 @@ @ Output: r0 = INT (SQRT (r0)), precision is 16 bits @ Registers touched: r1, r2 -#include "webrtc/system_wrappers/interface/asm_defines.h" +#include "webrtc/system_wrappers/include/asm_defines.h" GLOBAL_FUNCTION WebRtcSpl_SqrtFloor .align 2 diff --git a/webrtc/common_video/incoming_video_stream.cc b/webrtc/common_video/incoming_video_stream.cc index ba9995df07..79bbb8a7b6 100644 --- a/webrtc/common_video/incoming_video_stream.cc +++ b/webrtc/common_video/incoming_video_stream.cc @@ -23,11 +23,11 @@ #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/common_video/video_render_frames.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" -#include "webrtc/system_wrappers/interface/tick_util.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" +#include "webrtc/system_wrappers/include/tick_util.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { diff --git a/webrtc/common_video/interface/video_frame_buffer.h b/webrtc/common_video/interface/video_frame_buffer.h index ed1df488c2..1062165b81 100644 --- a/webrtc/common_video/interface/video_frame_buffer.h +++ b/webrtc/common_video/interface/video_frame_buffer.h @@ -15,7 +15,7 @@ #include "webrtc/base/refcount.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/scoped_ref_ptr.h" -#include "webrtc/system_wrappers/interface/aligned_malloc.h" +#include "webrtc/system_wrappers/include/aligned_malloc.h" namespace webrtc { diff --git a/webrtc/common_video/libyuv/libyuv_unittest.cc b/webrtc/common_video/libyuv/libyuv_unittest.cc index c31fc755b9..b674b51b67 100644 --- a/webrtc/common_video/libyuv/libyuv_unittest.cc +++ b/webrtc/common_video/libyuv/libyuv_unittest.cc @@ -14,7 +14,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/tick_util.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/video_frame.h" diff --git a/webrtc/common_video/libyuv/scaler_unittest.cc b/webrtc/common_video/libyuv/scaler_unittest.cc index 2e23ea0566..568311bc2e 100644 --- a/webrtc/common_video/libyuv/scaler_unittest.cc +++ b/webrtc/common_video/libyuv/scaler_unittest.cc @@ -13,7 +13,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/common_video/libyuv/include/scaler.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/tick_util.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/gtest_disable.h" diff --git a/webrtc/common_video/plane.h b/webrtc/common_video/plane.h index 1d80189a75..3ef949adf0 100644 --- a/webrtc/common_video/plane.h +++ b/webrtc/common_video/plane.h @@ -12,7 +12,7 @@ #define COMMON_VIDEO_PLANE_H #include "webrtc/base/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/aligned_malloc.h" +#include "webrtc/system_wrappers/include/aligned_malloc.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/common_video/video_render_frames.cc b/webrtc/common_video/video_render_frames.cc index d865a3195a..f4ece5e8e9 100644 --- a/webrtc/common_video/video_render_frames.cc +++ b/webrtc/common_video/video_render_frames.cc @@ -13,8 +13,8 @@ #include #include "webrtc/modules/interface/module_common_types.h" -#include "webrtc/system_wrappers/interface/tick_util.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/tick_util.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc b/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc index 80fb3929b9..0ec115414b 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc @@ -13,7 +13,7 @@ #include "webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h" #include "webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_tables.h" #include "webrtc/modules/audio_coding/codecs/isac/fix/source/settings.h" -#include "webrtc/system_wrappers/interface/cpu_features_wrapper.h" +#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" #include "webrtc/typedefs.h" class FilterBanksTest : public testing::Test { diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/filters_unittest.cc b/webrtc/modules/audio_coding/codecs/isac/fix/source/filters_unittest.cc index de1140be4d..5cce1e9f0b 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/filters_unittest.cc +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/filters_unittest.cc @@ -9,7 +9,7 @@ */ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/audio_coding/codecs/isac/fix/source/codec.h" -#include "webrtc/system_wrappers/interface/cpu_features_wrapper.h" +#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" #include "webrtc/typedefs.h" class FiltersTest : public testing::Test { diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.c b/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.c index 21911dd058..ec1cdc6ec3 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.c +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.c @@ -26,7 +26,7 @@ #include "webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h" #include "webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.h" #include "webrtc/modules/audio_coding/codecs/isac/fix/source/structs.h" -#include "webrtc/system_wrappers/interface/cpu_features_wrapper.h" +#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" // Declare function pointers. FilterMaLoopFix WebRtcIsacfix_FilterMaLoopFix; diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_armv7.S b/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_armv7.S index 945d6ee3a8..36411df0ab 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_armv7.S +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_armv7.S @@ -25,7 +25,7 @@ @ r12: constant #16384 @ r6, r7, r8, r10, r11: scratch -#include "webrtc/system_wrappers/interface/asm_defines.h" +#include "webrtc/system_wrappers/include/asm_defines.h" #include "settings.h" GLOBAL_FUNCTION WebRtcIsacfix_FilterArLoop diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc b/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc index 0d32ff8c5e..0984346019 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc @@ -10,7 +10,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.h" -#include "webrtc/system_wrappers/interface/cpu_features_wrapper.h" +#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" #include "webrtc/typedefs.h" class LpcMaskingModelTest : public testing::Test { diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.c b/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.c index c4024987de..3e7beede9f 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.c +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.c @@ -10,7 +10,7 @@ #include "webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/system_wrappers/interface/compile_assert_c.h" +#include "webrtc/system_wrappers/include/compile_assert_c.h" /* log2[0.2, 0.5, 0.98] in Q8 */ static const int16_t kLogLagWinQ8[3] = { diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator_c.c b/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator_c.c index 362bc1acee..18377dd370 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator_c.c +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator_c.c @@ -15,7 +15,7 @@ #endif #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/system_wrappers/interface/compile_assert_c.h" +#include "webrtc/system_wrappers/include/compile_assert_c.h" extern int32_t WebRtcIsacfix_Log2Q8(uint32_t x); diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator_mips.c b/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator_mips.c index f5e7e7fb9d..bd26700058 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator_mips.c +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator_mips.c @@ -10,7 +10,7 @@ #include "webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/system_wrappers/interface/compile_assert_c.h" +#include "webrtc/system_wrappers/include/compile_assert_c.h" extern int32_t WebRtcIsacfix_Log2Q8(uint32_t x); diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter.c b/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter.c index d73a429178..65d099d36a 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter.c +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter.c @@ -13,7 +13,7 @@ #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/modules/audio_coding/codecs/isac/fix/source/settings.h" #include "webrtc/modules/audio_coding/codecs/isac/fix/source/structs.h" -#include "webrtc/system_wrappers/interface/compile_assert_c.h" +#include "webrtc/system_wrappers/include/compile_assert_c.h" // Number of segments in a pitch subframe. static const int kSegments = 5; diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter_armv6.S b/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter_armv6.S index 10b9579ccb..bc18d44568 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter_armv6.S +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter_armv6.S @@ -13,7 +13,7 @@ @ @ Output is bit-exact with the reference C code in pitch_filter.c. -#include "webrtc/system_wrappers/interface/asm_defines.h" +#include "webrtc/system_wrappers/include/asm_defines.h" #include "settings.h" GLOBAL_FUNCTION WebRtcIsacfix_PitchFilterCore diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/transform_unittest.cc b/webrtc/modules/audio_coding/codecs/isac/fix/source/transform_unittest.cc index 0dd2453075..58d890011f 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/transform_unittest.cc +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/transform_unittest.cc @@ -9,7 +9,7 @@ */ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/audio_coding/codecs/isac/fix/source/codec.h" -#include "webrtc/system_wrappers/interface/cpu_features_wrapper.h" +#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" static const int kSamples = FRAMESAMPLES/2; static const int32_t spec2time_out_expected_1[kSamples] = { diff --git a/webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h b/webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h index bf39003c12..bbb040de1d 100644 --- a/webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h +++ b/webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h @@ -14,7 +14,7 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/thread_annotations.h" #include "webrtc/modules/audio_coding/codecs/isac/bandwidth_info.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc b/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc index a619e82910..14a0df3a09 100644 --- a/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc +++ b/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc @@ -21,7 +21,7 @@ #include "webrtc/base/checks.h" #include "webrtc/modules/audio_coding/main/acm2/acm_common_defs.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/main/acm2/acm_receive_test_oldapi.h b/webrtc/modules/audio_coding/main/acm2/acm_receive_test_oldapi.h index 6c1209739d..0b5671fe8c 100644 --- a/webrtc/modules/audio_coding/main/acm2/acm_receive_test_oldapi.h +++ b/webrtc/modules/audio_coding/main/acm2/acm_receive_test_oldapi.h @@ -13,7 +13,7 @@ #include "webrtc/base/constructormagic.h" #include "webrtc/base/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" namespace webrtc { class AudioCodingModule; diff --git a/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc b/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc index 23ffafcb83..9b5deace4e 100644 --- a/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc +++ b/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc @@ -26,10 +26,10 @@ #include "webrtc/modules/audio_coding/main/acm2/call_statistics.h" #include "webrtc/modules/audio_coding/main/acm2/nack.h" #include "webrtc/modules/audio_coding/neteq/interface/neteq.h" -#include "webrtc/system_wrappers/interface/clock.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/tick_util.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/clock.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/tick_util.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest_oldapi.cc b/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest_oldapi.cc index 7330a9f437..152daf3de9 100644 --- a/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest_oldapi.cc +++ b/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest_oldapi.cc @@ -18,7 +18,7 @@ #include "webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.h" #include "webrtc/modules/audio_coding/main/acm2/acm_codec_database.h" #include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" #include "webrtc/test/test_suite.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/gtest_disable.h" diff --git a/webrtc/modules/audio_coding/main/acm2/acm_resampler.cc b/webrtc/modules/audio_coding/main/acm2/acm_resampler.cc index 2650725331..cbcad85f5b 100644 --- a/webrtc/modules/audio_coding/main/acm2/acm_resampler.cc +++ b/webrtc/modules/audio_coding/main/acm2/acm_resampler.cc @@ -14,7 +14,7 @@ #include #include "webrtc/common_audio/resampler/include/resampler.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { namespace acm2 { diff --git a/webrtc/modules/audio_coding/main/acm2/acm_send_test_oldapi.h b/webrtc/modules/audio_coding/main/acm2/acm_send_test_oldapi.h index 7d17cb117d..fec2b5909a 100644 --- a/webrtc/modules/audio_coding/main/acm2/acm_send_test_oldapi.h +++ b/webrtc/modules/audio_coding/main/acm2/acm_send_test_oldapi.h @@ -17,7 +17,7 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h" #include "webrtc/modules/audio_coding/neteq/tools/packet_source.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" namespace webrtc { class AudioEncoder; diff --git a/webrtc/modules/audio_coding/main/acm2/audio_coding_module.cc b/webrtc/modules/audio_coding/main/acm2/audio_coding_module.cc index 7754a9c375..cdad3a6c57 100644 --- a/webrtc/modules/audio_coding/main/acm2/audio_coding_module.cc +++ b/webrtc/modules/audio_coding/main/acm2/audio_coding_module.cc @@ -14,8 +14,8 @@ #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.h" #include "webrtc/modules/audio_coding/main/acm2/rent_a_codec.h" -#include "webrtc/system_wrappers/interface/clock.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/clock.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc index 91541073b0..520420a74a 100644 --- a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc +++ b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc @@ -21,11 +21,11 @@ #include "webrtc/modules/audio_coding/main/acm2/acm_common_defs.h" #include "webrtc/modules/audio_coding/main/acm2/acm_resampler.h" #include "webrtc/modules/audio_coding/main/acm2/call_statistics.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/logging.h" -#include "webrtc/system_wrappers/interface/metrics.h" -#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/logging.h" +#include "webrtc/system_wrappers/include/metrics.h" +#include "webrtc/system_wrappers/include/rw_lock_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc index e36d4e6d90..f9c7ddb581 100644 --- a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc +++ b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc @@ -34,11 +34,11 @@ #include "webrtc/modules/audio_coding/neteq/tools/packet.h" #include "webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h" #include "webrtc/modules/interface/module_common_types.h" -#include "webrtc/system_wrappers/interface/clock.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/sleep.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/include/clock.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/sleep.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/gtest_disable.h" diff --git a/webrtc/modules/audio_coding/main/acm2/codec_manager.cc b/webrtc/modules/audio_coding/main/acm2/codec_manager.cc index 7f3174939a..f9b77e8985 100644 --- a/webrtc/modules/audio_coding/main/acm2/codec_manager.cc +++ b/webrtc/modules/audio_coding/main/acm2/codec_manager.cc @@ -13,7 +13,7 @@ #include "webrtc/base/checks.h" #include "webrtc/engine_configurations.h" #include "webrtc/modules/audio_coding/main/acm2/acm_codec_database.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { namespace acm2 { diff --git a/webrtc/modules/audio_coding/main/acm2/nack.cc b/webrtc/modules/audio_coding/main/acm2/nack.cc index 525b1ea8c6..d50904513a 100644 --- a/webrtc/modules/audio_coding/main/acm2/nack.cc +++ b/webrtc/modules/audio_coding/main/acm2/nack.cc @@ -15,7 +15,7 @@ #include // For std::max. #include "webrtc/modules/interface/module_common_types.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/main/interface/audio_coding_module.h b/webrtc/modules/audio_coding/main/interface/audio_coding_module.h index 830f1e5b77..35dcb8383c 100644 --- a/webrtc/modules/audio_coding/main/interface/audio_coding_module.h +++ b/webrtc/modules/audio_coding/main/interface/audio_coding_module.h @@ -18,7 +18,7 @@ #include "webrtc/modules/audio_coding/main/interface/audio_coding_module_typedefs.h" #include "webrtc/modules/audio_coding/neteq/interface/neteq.h" #include "webrtc/modules/interface/module.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/main/test/APITest.cc b/webrtc/modules/audio_coding/main/test/APITest.cc index c84d3c076a..1313f35332 100644 --- a/webrtc/modules/audio_coding/main/test/APITest.cc +++ b/webrtc/modules/audio_coding/main/test/APITest.cc @@ -25,10 +25,10 @@ #include "webrtc/engine_configurations.h" #include "webrtc/modules/audio_coding/main/acm2/acm_common_defs.h" #include "webrtc/modules/audio_coding/main/test/utility.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" -#include "webrtc/system_wrappers/interface/tick_util.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" +#include "webrtc/system_wrappers/include/tick_util.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/testsupport/fileutils.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/main/test/APITest.h b/webrtc/modules/audio_coding/main/test/APITest.h index 67261dcbcd..ea6a9bcc34 100644 --- a/webrtc/modules/audio_coding/main/test/APITest.h +++ b/webrtc/modules/audio_coding/main/test/APITest.h @@ -17,8 +17,8 @@ #include "webrtc/modules/audio_coding/main/test/Channel.h" #include "webrtc/modules/audio_coding/main/test/PCMFile.h" #include "webrtc/modules/audio_coding/main/test/utility.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/rw_lock_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/main/test/Channel.cc b/webrtc/modules/audio_coding/main/test/Channel.cc index 1b0a610b17..02bd783a38 100644 --- a/webrtc/modules/audio_coding/main/test/Channel.cc +++ b/webrtc/modules/audio_coding/main/test/Channel.cc @@ -14,8 +14,8 @@ #include #include "webrtc/base/format_macros.h" -#include "webrtc/system_wrappers/interface/tick_util.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/tick_util.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/main/test/EncodeDecodeTest.cc b/webrtc/modules/audio_coding/main/test/EncodeDecodeTest.cc index 8394bc03ab..eca8bc869f 100644 --- a/webrtc/modules/audio_coding/main/test/EncodeDecodeTest.cc +++ b/webrtc/modules/audio_coding/main/test/EncodeDecodeTest.cc @@ -20,7 +20,7 @@ #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h" #include "webrtc/modules/audio_coding/main/acm2/acm_common_defs.h" #include "webrtc/modules/audio_coding/main/test/utility.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/testsupport/fileutils.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/main/test/RTPFile.cc b/webrtc/modules/audio_coding/main/test/RTPFile.cc index 4e81943de4..60777178c6 100644 --- a/webrtc/modules/audio_coding/main/test/RTPFile.cc +++ b/webrtc/modules/audio_coding/main/test/RTPFile.cc @@ -21,7 +21,7 @@ #include "audio_coding_module.h" #include "engine_configurations.h" -#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h" +#include "webrtc/system_wrappers/include/rw_lock_wrapper.h" // TODO(tlegrand): Consider removing usage of gtest. #include "testing/gtest/include/gtest/gtest.h" diff --git a/webrtc/modules/audio_coding/main/test/RTPFile.h b/webrtc/modules/audio_coding/main/test/RTPFile.h index 346440b1b3..3853265085 100644 --- a/webrtc/modules/audio_coding/main/test/RTPFile.h +++ b/webrtc/modules/audio_coding/main/test/RTPFile.h @@ -16,7 +16,7 @@ #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h" #include "webrtc/modules/interface/module_common_types.h" -#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h" +#include "webrtc/system_wrappers/include/rw_lock_wrapper.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/main/test/SpatialAudio.cc b/webrtc/modules/audio_coding/main/test/SpatialAudio.cc index 134d9755e5..17d4fc88b2 100644 --- a/webrtc/modules/audio_coding/main/test/SpatialAudio.cc +++ b/webrtc/modules/audio_coding/main/test/SpatialAudio.cc @@ -15,8 +15,8 @@ #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/main/test/SpatialAudio.h" -#include "webrtc/system_wrappers/interface/trace.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/testsupport/fileutils.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/main/test/TestAllCodecs.cc b/webrtc/modules/audio_coding/main/test/TestAllCodecs.cc index 85c2579fc2..4663d01112 100644 --- a/webrtc/modules/audio_coding/main/test/TestAllCodecs.cc +++ b/webrtc/modules/audio_coding/main/test/TestAllCodecs.cc @@ -21,7 +21,7 @@ #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h" #include "webrtc/modules/audio_coding/main/interface/audio_coding_module_typedefs.h" #include "webrtc/modules/audio_coding/main/test/utility.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_coding/main/test/TestRedFec.cc b/webrtc/modules/audio_coding/main/test/TestRedFec.cc index 7a512b4433..d19b83e1aa 100644 --- a/webrtc/modules/audio_coding/main/test/TestRedFec.cc +++ b/webrtc/modules/audio_coding/main/test/TestRedFec.cc @@ -17,7 +17,7 @@ #include "webrtc/engine_configurations.h" #include "webrtc/modules/audio_coding/main/interface/audio_coding_module_typedefs.h" #include "webrtc/modules/audio_coding/main/test/utility.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/testsupport/fileutils.h" #ifdef SUPPORT_RED_WB diff --git a/webrtc/modules/audio_coding/main/test/TestStereo.cc b/webrtc/modules/audio_coding/main/test/TestStereo.cc index b0786be608..cacd14aa89 100644 --- a/webrtc/modules/audio_coding/main/test/TestStereo.cc +++ b/webrtc/modules/audio_coding/main/test/TestStereo.cc @@ -19,7 +19,7 @@ #include "webrtc/engine_configurations.h" #include "webrtc/modules/audio_coding/main/interface/audio_coding_module_typedefs.h" #include "webrtc/modules/audio_coding/main/test/utility.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/testsupport/fileutils.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/main/test/Tester.cc b/webrtc/modules/audio_coding/main/test/Tester.cc index b6850fabba..24d7495b79 100644 --- a/webrtc/modules/audio_coding/main/test/Tester.cc +++ b/webrtc/modules/audio_coding/main/test/Tester.cc @@ -24,7 +24,7 @@ #include "webrtc/modules/audio_coding/main/test/TestStereo.h" #include "webrtc/modules/audio_coding/main/test/TestVADDTX.h" #include "webrtc/modules/audio_coding/main/test/TwoWayCommunication.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/gtest_disable.h" diff --git a/webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc b/webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc index 00853aead7..2ff2a85afe 100644 --- a/webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc +++ b/webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc @@ -23,7 +23,7 @@ #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/main/test/PCMFile.h" #include "webrtc/modules/audio_coding/main/test/utility.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/testsupport/fileutils.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/main/test/delay_test.cc b/webrtc/modules/audio_coding/main/test/delay_test.cc index 0f9e8b07f5..304f188eab 100644 --- a/webrtc/modules/audio_coding/main/test/delay_test.cc +++ b/webrtc/modules/audio_coding/main/test/delay_test.cc @@ -25,7 +25,7 @@ #include "webrtc/modules/audio_coding/main/test/Channel.h" #include "webrtc/modules/audio_coding/main/test/PCMFile.h" #include "webrtc/modules/audio_coding/main/test/utility.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/test/testsupport/fileutils.h" DEFINE_string(codec, "isac", "Codec Name"); diff --git a/webrtc/modules/audio_coding/main/test/iSACTest.cc b/webrtc/modules/audio_coding/main/test/iSACTest.cc index bd796d1ce7..35c34d5947 100644 --- a/webrtc/modules/audio_coding/main/test/iSACTest.cc +++ b/webrtc/modules/audio_coding/main/test/iSACTest.cc @@ -25,9 +25,9 @@ #include "webrtc/modules/audio_coding/main/acm2/acm_common_defs.h" #include "webrtc/modules/audio_coding/main/test/utility.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/tick_util.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/tick_util.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/testsupport/fileutils.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/main/test/initial_delay_unittest.cc b/webrtc/modules/audio_coding/main/test/initial_delay_unittest.cc index 0bac4013f5..3074a0513a 100644 --- a/webrtc/modules/audio_coding/main/test/initial_delay_unittest.cc +++ b/webrtc/modules/audio_coding/main/test/initial_delay_unittest.cc @@ -23,7 +23,7 @@ #include "webrtc/modules/audio_coding/main/test/Channel.h" #include "webrtc/modules/audio_coding/main/test/PCMFile.h" #include "webrtc/modules/audio_coding/main/test/utility.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/gtest_disable.h" diff --git a/webrtc/modules/audio_coding/main/test/insert_packet_with_timing.cc b/webrtc/modules/audio_coding/main/test/insert_packet_with_timing.cc index 7331696c20..53d494eb15 100644 --- a/webrtc/modules/audio_coding/main/test/insert_packet_with_timing.cc +++ b/webrtc/modules/audio_coding/main/test/insert_packet_with_timing.cc @@ -18,7 +18,7 @@ #include "webrtc/modules/audio_coding/main/test/Channel.h" #include "webrtc/modules/audio_coding/main/test/PCMFile.h" #include "webrtc/modules/interface/module_common_types.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" #include "webrtc/test/testsupport/fileutils.h" // Codec. diff --git a/webrtc/modules/audio_coding/main/test/opus_test.cc b/webrtc/modules/audio_coding/main/test/opus_test.cc index d6482dd447..add9b2b8be 100644 --- a/webrtc/modules/audio_coding/main/test/opus_test.cc +++ b/webrtc/modules/audio_coding/main/test/opus_test.cc @@ -22,7 +22,7 @@ #include "webrtc/modules/audio_coding/main/acm2/acm_codec_database.h" #include "webrtc/modules/audio_coding/main/test/TestStereo.h" #include "webrtc/modules/audio_coding/main/test/utility.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/testsupport/fileutils.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/main/test/target_delay_unittest.cc b/webrtc/modules/audio_coding/main/test/target_delay_unittest.cc index f1c43829bc..5f5fd50da4 100644 --- a/webrtc/modules/audio_coding/main/test/target_delay_unittest.cc +++ b/webrtc/modules/audio_coding/main/test/target_delay_unittest.cc @@ -15,7 +15,7 @@ #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h" #include "webrtc/modules/audio_coding/main/test/utility.h" #include "webrtc/modules/interface/module_common_types.h" -#include "webrtc/system_wrappers/interface/sleep.h" +#include "webrtc/system_wrappers/include/sleep.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/gtest_disable.h" diff --git a/webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc b/webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc index 8ee860c35c..195da53960 100644 --- a/webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc @@ -33,7 +33,7 @@ #include "webrtc/modules/audio_coding/codecs/pcm16b/include/audio_decoder_pcm16b.h" #include "webrtc/modules/audio_coding/codecs/pcm16b/include/audio_encoder_pcm16b.h" #include "webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h" -#include "webrtc/system_wrappers/interface/data_log.h" +#include "webrtc/system_wrappers/include/data_log.h" #include "webrtc/test/testsupport/fileutils.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/decision_logic.cc b/webrtc/modules/audio_coding/neteq/decision_logic.cc index eb10e65897..14e0426d7d 100644 --- a/webrtc/modules/audio_coding/neteq/decision_logic.cc +++ b/webrtc/modules/audio_coding/neteq/decision_logic.cc @@ -19,7 +19,7 @@ #include "webrtc/modules/audio_coding/neteq/expand.h" #include "webrtc/modules/audio_coding/neteq/packet_buffer.h" #include "webrtc/modules/audio_coding/neteq/sync_buffer.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/delay_manager.cc b/webrtc/modules/audio_coding/neteq/delay_manager.cc index e7f76f616e..ea968aadb4 100644 --- a/webrtc/modules/audio_coding/neteq/delay_manager.cc +++ b/webrtc/modules/audio_coding/neteq/delay_manager.cc @@ -18,7 +18,7 @@ #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h" #include "webrtc/modules/interface/module_common_types.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/neteq_impl.cc b/webrtc/modules/audio_coding/neteq/neteq_impl.cc index 7c049b0152..ead08f12fb 100644 --- a/webrtc/modules/audio_coding/neteq/neteq_impl.cc +++ b/webrtc/modules/audio_coding/neteq/neteq_impl.cc @@ -42,7 +42,7 @@ #include "webrtc/modules/audio_coding/neteq/sync_buffer.h" #include "webrtc/modules/audio_coding/neteq/timestamp_scaler.h" #include "webrtc/modules/interface/module_common_types.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" // Modify the code to obtain backwards bit-exactness. Once bit-exactness is no // longer required, this #define should be removed (and the code that it diff --git a/webrtc/modules/audio_coding/neteq/statistics_calculator.cc b/webrtc/modules/audio_coding/neteq/statistics_calculator.cc index 78c5e25258..e6a6fbf705 100644 --- a/webrtc/modules/audio_coding/neteq/statistics_calculator.cc +++ b/webrtc/modules/audio_coding/neteq/statistics_calculator.cc @@ -18,7 +18,7 @@ #include "webrtc/base/safe_conversions.h" #include "webrtc/modules/audio_coding/neteq/decision_logic.h" #include "webrtc/modules/audio_coding/neteq/delay_manager.h" -#include "webrtc/system_wrappers/interface/metrics.h" +#include "webrtc/system_wrappers/include/metrics.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/test/rtp_to_text.cc b/webrtc/modules/audio_coding/neteq/test/rtp_to_text.cc index aa3f28f361..572b9d3b70 100644 --- a/webrtc/modules/audio_coding/neteq/test/rtp_to_text.cc +++ b/webrtc/modules/audio_coding/neteq/test/rtp_to_text.cc @@ -17,7 +17,7 @@ * */ -#include "webrtc/system_wrappers/interface/data_log.h" +#include "webrtc/system_wrappers/include/data_log.h" #include "NETEQTEST_DummyRTPpacket.h" #include "NETEQTEST_RTPpacket.h" diff --git a/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc b/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc index 950c09cdd9..0b0c73741c 100644 --- a/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc +++ b/webrtc/modules/audio_coding/neteq/timestamp_scaler.cc @@ -12,7 +12,7 @@ #include "webrtc/modules/audio_coding/neteq/decoder_database.h" #include "webrtc/modules/audio_coding/neteq/defines.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.cc b/webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.cc index 57397e14a3..80e9c738ea 100644 --- a/webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.cc +++ b/webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.cc @@ -14,7 +14,7 @@ #include "webrtc/modules/audio_coding/neteq/interface/neteq.h" #include "webrtc/modules/audio_coding/neteq/tools/audio_loop.h" #include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_rtpplay.cc b/webrtc/modules/audio_coding/neteq/tools/neteq_rtpplay.cc index 300537b221..31af682c0f 100644 --- a/webrtc/modules/audio_coding/neteq/tools/neteq_rtpplay.cc +++ b/webrtc/modules/audio_coding/neteq/tools/neteq_rtpplay.cc @@ -35,7 +35,7 @@ #include "webrtc/modules/audio_coding/neteq/tools/rtc_event_log_source.h" #include "webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h" #include "webrtc/modules/interface/module_common_types.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/rtp_file_reader.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc index 82480d2e65..2d2cf9dbb8 100644 --- a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc +++ b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc @@ -13,8 +13,8 @@ #include "webrtc/modules/audio_conference_mixer/source/audio_frame_manipulator.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/modules/utility/interface/audio_frame_operations.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { namespace { diff --git a/webrtc/modules/audio_conference_mixer/source/memory_pool_posix.h b/webrtc/modules/audio_conference_mixer/source/memory_pool_posix.h index 04e7cd5225..12aae3f278 100644 --- a/webrtc/modules/audio_conference_mixer/source/memory_pool_posix.h +++ b/webrtc/modules/audio_conference_mixer/source/memory_pool_posix.h @@ -14,7 +14,7 @@ #include #include -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_conference_mixer/source/memory_pool_win.h b/webrtc/modules/audio_conference_mixer/source/memory_pool_win.h index 772a123ab7..3ec9187492 100644 --- a/webrtc/modules/audio_conference_mixer/source/memory_pool_win.h +++ b/webrtc/modules/audio_conference_mixer/source/memory_pool_win.h @@ -14,8 +14,8 @@ #include #include -#include "webrtc/system_wrappers/interface/aligned_malloc.h" -#include "webrtc/system_wrappers/interface/atomic32.h" +#include "webrtc/system_wrappers/include/aligned_malloc.h" +#include "webrtc/system_wrappers/include/atomic32.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_conference_mixer/source/time_scheduler.cc b/webrtc/modules/audio_conference_mixer/source/time_scheduler.cc index 4d75bc55bb..19f5bd8848 100644 --- a/webrtc/modules/audio_conference_mixer/source/time_scheduler.cc +++ b/webrtc/modules/audio_conference_mixer/source/time_scheduler.cc @@ -9,7 +9,7 @@ */ #include "webrtc/modules/audio_conference_mixer/source/time_scheduler.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" namespace webrtc { TimeScheduler::TimeScheduler(const int64_t periodicityInMs) diff --git a/webrtc/modules/audio_conference_mixer/source/time_scheduler.h b/webrtc/modules/audio_conference_mixer/source/time_scheduler.h index 5152b2dadb..09d0caa66a 100644 --- a/webrtc/modules/audio_conference_mixer/source/time_scheduler.h +++ b/webrtc/modules/audio_conference_mixer/source/time_scheduler.h @@ -15,7 +15,7 @@ #ifndef WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_TIME_SCHEDULER_H_ #define WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_TIME_SCHEDULER_H_ -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/tick_util.h" namespace webrtc { class CriticalSectionWrapper; diff --git a/webrtc/modules/audio_device/android/audio_device_template.h b/webrtc/modules/audio_device/android/audio_device_template.h index 47e353dfd5..719b4bdd36 100644 --- a/webrtc/modules/audio_device/android/audio_device_template.h +++ b/webrtc/modules/audio_device/android/audio_device_template.h @@ -17,7 +17,7 @@ #include "webrtc/base/thread_checker.h" #include "webrtc/modules/audio_device/android/audio_manager.h" #include "webrtc/modules/audio_device/audio_device_generic.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" #define TAG "AudioDeviceTemplate" #define ALOGW(...) __android_log_print(ANDROID_LOG_WARN, TAG, __VA_ARGS__) diff --git a/webrtc/modules/audio_device/android/audio_device_unittest.cc b/webrtc/modules/audio_device/android/audio_device_unittest.cc index 9db5a8eec3..7b2d6354c4 100644 --- a/webrtc/modules/audio_device/android/audio_device_unittest.cc +++ b/webrtc/modules/audio_device/android/audio_device_unittest.cc @@ -28,9 +28,9 @@ #include "webrtc/modules/audio_device/android/ensure_initialized.h" #include "webrtc/modules/audio_device/audio_device_impl.h" #include "webrtc/modules/audio_device/include/audio_device.h" -#include "webrtc/system_wrappers/interface/clock.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/sleep.h" +#include "webrtc/system_wrappers/include/clock.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/sleep.h" #include "webrtc/test/testsupport/fileutils.h" using std::cout; diff --git a/webrtc/modules/audio_device/audio_device_buffer.cc b/webrtc/modules/audio_device/audio_device_buffer.cc index cc6d6bb1f7..e7b487d687 100644 --- a/webrtc/modules/audio_device/audio_device_buffer.cc +++ b/webrtc/modules/audio_device/audio_device_buffer.cc @@ -15,9 +15,9 @@ #include "webrtc/base/format_macros.h" #include "webrtc/modules/audio_device/audio_device_config.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/logging.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/logging.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/audio_device_buffer.h b/webrtc/modules/audio_device/audio_device_buffer.h index 63a05ef82a..2ab7ff5547 100644 --- a/webrtc/modules/audio_device/audio_device_buffer.h +++ b/webrtc/modules/audio_device/audio_device_buffer.h @@ -12,7 +12,7 @@ #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_BUFFER_H #include "webrtc/modules/audio_device/include/audio_device.h" -#include "webrtc/system_wrappers/interface/file_wrapper.h" +#include "webrtc/system_wrappers/include/file_wrapper.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/audio_device_impl.cc b/webrtc/modules/audio_device/audio_device_impl.cc index 02fa9d9e34..a11c496289 100644 --- a/webrtc/modules/audio_device/audio_device_impl.cc +++ b/webrtc/modules/audio_device/audio_device_impl.cc @@ -11,8 +11,8 @@ #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/modules/audio_device/audio_device_config.h" #include "webrtc/modules/audio_device/audio_device_impl.h" -#include "webrtc/system_wrappers/interface/ref_count.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/ref_count.h" +#include "webrtc/system_wrappers/include/tick_util.h" #include #include @@ -48,8 +48,8 @@ #include "webrtc/modules/audio_device/dummy/audio_device_dummy.h" #include "webrtc/modules/audio_device/dummy/file_audio_device.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" #define CHECK_INITIALIZED() \ { \ diff --git a/webrtc/modules/audio_device/dummy/file_audio_device.cc b/webrtc/modules/audio_device/dummy/file_audio_device.cc index a2eac87673..9c7bf069d8 100644 --- a/webrtc/modules/audio_device/dummy/file_audio_device.cc +++ b/webrtc/modules/audio_device/dummy/file_audio_device.cc @@ -9,8 +9,8 @@ */ #include #include "webrtc/modules/audio_device/dummy/file_audio_device.h" -#include "webrtc/system_wrappers/interface/sleep.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/include/sleep.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/dummy/file_audio_device.h b/webrtc/modules/audio_device/dummy/file_audio_device.h index 91a7d22f64..0e1665ea72 100644 --- a/webrtc/modules/audio_device/dummy/file_audio_device.h +++ b/webrtc/modules/audio_device/dummy/file_audio_device.h @@ -16,9 +16,9 @@ #include #include "webrtc/modules/audio_device/audio_device_generic.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/file_wrapper.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/file_wrapper.h" +#include "webrtc/system_wrappers/include/clock.h" namespace webrtc { class EventWrapper; diff --git a/webrtc/modules/audio_device/ios/audio_device_unittest_ios.cc b/webrtc/modules/audio_device/ios/audio_device_unittest_ios.cc index d639feae03..b892f28b1d 100644 --- a/webrtc/modules/audio_device/ios/audio_device_unittest_ios.cc +++ b/webrtc/modules/audio_device/ios/audio_device_unittest_ios.cc @@ -26,9 +26,9 @@ #include "webrtc/modules/audio_device/audio_device_impl.h" #include "webrtc/modules/audio_device/include/audio_device.h" #include "webrtc/modules/audio_device/ios/audio_device_ios.h" -#include "webrtc/system_wrappers/interface/clock.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/sleep.h" +#include "webrtc/system_wrappers/include/clock.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/sleep.h" #include "webrtc/test/testsupport/fileutils.h" using std::cout; diff --git a/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc b/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc index 2d18f542b7..8fa4fdf6f0 100644 --- a/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc +++ b/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc @@ -13,9 +13,9 @@ #include "webrtc/modules/audio_device/audio_device_config.h" #include "webrtc/modules/audio_device/linux/audio_device_alsa_linux.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/sleep.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/sleep.h" +#include "webrtc/system_wrappers/include/trace.h" webrtc_adm_linux_alsa::AlsaSymbolTable AlsaSymbolTable; diff --git a/webrtc/modules/audio_device/linux/audio_device_alsa_linux.h b/webrtc/modules/audio_device/linux/audio_device_alsa_linux.h index 6233277442..e2391a0456 100644 --- a/webrtc/modules/audio_device/linux/audio_device_alsa_linux.h +++ b/webrtc/modules/audio_device/linux/audio_device_alsa_linux.h @@ -13,8 +13,8 @@ #include "webrtc/modules/audio_device/audio_device_generic.h" #include "webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" #if defined(USE_X11) #include diff --git a/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc b/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc index 7bb7347a20..929a758e40 100644 --- a/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc +++ b/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc @@ -15,8 +15,8 @@ #include "webrtc/modules/audio_device/audio_device_config.h" #include "webrtc/modules/audio_device/linux/audio_device_pulse_linux.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" webrtc_adm_linux_pulse::PulseAudioSymbolTable PaSymbolTable; diff --git a/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h b/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h index 495a7ebd35..718331188d 100644 --- a/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h +++ b/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h @@ -13,8 +13,8 @@ #include "webrtc/modules/audio_device/audio_device_generic.h" #include "webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" #include "webrtc/base/thread_checker.h" #include diff --git a/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc b/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc index df9dcabea5..29620eb043 100644 --- a/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc +++ b/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc @@ -11,7 +11,7 @@ #include #include "webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" extern webrtc_adm_linux_alsa::AlsaSymbolTable AlsaSymbolTable; diff --git a/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h b/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h index 21618e2f83..b8be8c1b70 100644 --- a/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h +++ b/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h @@ -13,7 +13,7 @@ #include "webrtc/modules/audio_device/include/audio_device.h" #include "webrtc/modules/audio_device/linux/alsasymboltable_linux.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/typedefs.h" #include diff --git a/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc b/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc index bc2662e3e8..f73a399c9d 100644 --- a/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc +++ b/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc @@ -11,7 +11,7 @@ #include #include "webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/base/checks.h" extern webrtc_adm_linux_pulse::PulseAudioSymbolTable PaSymbolTable; diff --git a/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h b/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h index cb3d632983..025fdc5868 100644 --- a/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h +++ b/webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h @@ -13,7 +13,7 @@ #include "webrtc/modules/audio_device/include/audio_device.h" #include "webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/typedefs.h" #include "webrtc/base/thread_checker.h" diff --git a/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h b/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h index 2d8fafa04b..be2803ce79 100644 --- a/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h +++ b/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h @@ -16,7 +16,7 @@ #include #include "webrtc/base/constructormagic.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" // This file provides macros for creating "symbol table" classes to simplify the // dynamic loading of symbols from DLLs. Currently the implementation only diff --git a/webrtc/modules/audio_device/mac/audio_device_mac.cc b/webrtc/modules/audio_device/mac/audio_device_mac.cc index 77dab0b83e..db98675bf6 100644 --- a/webrtc/modules/audio_device/mac/audio_device_mac.cc +++ b/webrtc/modules/audio_device/mac/audio_device_mac.cc @@ -13,9 +13,9 @@ #include "webrtc/modules/audio_device/audio_device_config.h" #include "webrtc/modules/audio_device/mac/audio_device_mac.h" #include "webrtc/modules/audio_device/mac/portaudio/pa_ringbuffer.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" #include #include // OSAtomicCompareAndSwap() diff --git a/webrtc/modules/audio_device/mac/audio_device_mac.h b/webrtc/modules/audio_device/mac/audio_device_mac.h index 9029a01701..f2b66b4d06 100644 --- a/webrtc/modules/audio_device/mac/audio_device_mac.h +++ b/webrtc/modules/audio_device/mac/audio_device_mac.h @@ -15,7 +15,7 @@ #include "webrtc/base/thread_annotations.h" #include "webrtc/modules/audio_device/audio_device_generic.h" #include "webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include #include diff --git a/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.cc b/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.cc index 952dc11d8b..9016ffe508 100644 --- a/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.cc +++ b/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.cc @@ -9,7 +9,7 @@ */ #include "webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" #include // getpid() diff --git a/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h b/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h index 711d36d150..94d6928921 100644 --- a/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h +++ b/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h @@ -12,7 +12,7 @@ #define WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_MAC_H #include "webrtc/modules/audio_device/include/audio_device.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/typedefs.h" #include diff --git a/webrtc/modules/audio_device/test/audio_device_test_api.cc b/webrtc/modules/audio_device/test/audio_device_test_api.cc index cd80c4deab..f36a049ffc 100644 --- a/webrtc/modules/audio_device/test/audio_device_test_api.cc +++ b/webrtc/modules/audio_device/test/audio_device_test_api.cc @@ -19,7 +19,7 @@ #include "webrtc/modules/audio_device/audio_device_config.h" #include "webrtc/modules/audio_device/audio_device_impl.h" -#include "webrtc/system_wrappers/interface/sleep.h" +#include "webrtc/system_wrappers/include/sleep.h" // Helper functions #if defined(ANDROID) diff --git a/webrtc/modules/audio_device/test/audio_device_test_defines.h b/webrtc/modules/audio_device/test/audio_device_test_defines.h index 479861b125..5068646bdd 100644 --- a/webrtc/modules/audio_device/test/audio_device_test_defines.h +++ b/webrtc/modules/audio_device/test/audio_device_test_defines.h @@ -14,7 +14,7 @@ #include "webrtc/common_types.h" #include "webrtc/modules/audio_device/include/audio_device.h" #include "webrtc/modules/utility/interface/process_thread.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" #ifdef _WIN32 #define MACRO_DEFAULT_DEVICE AudioDeviceModule::kDefaultDevice diff --git a/webrtc/modules/audio_device/test/func_test_manager.cc b/webrtc/modules/audio_device/test/func_test_manager.cc index a97d25a451..0ebfc8395f 100644 --- a/webrtc/modules/audio_device/test/func_test_manager.cc +++ b/webrtc/modules/audio_device/test/func_test_manager.cc @@ -21,7 +21,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/audio_device/test/func_test_manager.h" -#include "webrtc/system_wrappers/interface/sleep.h" +#include "webrtc/system_wrappers/include/sleep.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/modules/audio_device/audio_device_config.h" diff --git a/webrtc/modules/audio_device/test/func_test_manager.h b/webrtc/modules/audio_device/test/func_test_manager.h index a91ae814e5..6ef13490d8 100644 --- a/webrtc/modules/audio_device/test/func_test_manager.h +++ b/webrtc/modules/audio_device/test/func_test_manager.h @@ -17,7 +17,7 @@ #include "webrtc/common_audio/resampler/include/resampler.h" #include "webrtc/modules/audio_device/include/audio_device.h" #include "webrtc/modules/audio_device/test/audio_device_test_defines.h" -#include "webrtc/system_wrappers/interface/file_wrapper.h" +#include "webrtc/system_wrappers/include/file_wrapper.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_device/win/audio_device_core_win.cc b/webrtc/modules/audio_device/win/audio_device_core_win.cc index 9931e9afe3..4b75922109 100644 --- a/webrtc/modules/audio_device/win/audio_device_core_win.cc +++ b/webrtc/modules/audio_device/win/audio_device_core_win.cc @@ -36,8 +36,8 @@ #include #include "webrtc/base/platform_thread.h" -#include "webrtc/system_wrappers/interface/sleep.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/sleep.h" +#include "webrtc/system_wrappers/include/trace.h" // Macro that calls a COM method returning HRESULT value. #define EXIT_ON_ERROR(hres) do { if (FAILED(hres)) goto Exit; } while(0) diff --git a/webrtc/modules/audio_device/win/audio_device_core_win.h b/webrtc/modules/audio_device/win/audio_device_core_win.h index 8d37006da9..5c94cfdd01 100644 --- a/webrtc/modules/audio_device/win/audio_device_core_win.h +++ b/webrtc/modules/audio_device/win/audio_device_core_win.h @@ -25,7 +25,7 @@ #include // IMediaObject #include "webrtc/base/scoped_ref_ptr.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" // Use Multimedia Class Scheduler Service (MMCSS) to boost the thread priority #pragma comment( lib, "avrt.lib" ) diff --git a/webrtc/modules/audio_device/win/audio_device_wave_win.cc b/webrtc/modules/audio_device/win/audio_device_wave_win.cc index 73c85083c1..96bee7425a 100644 --- a/webrtc/modules/audio_device/win/audio_device_wave_win.cc +++ b/webrtc/modules/audio_device/win/audio_device_wave_win.cc @@ -11,9 +11,9 @@ #include "webrtc/modules/audio_device/audio_device_config.h" #include "webrtc/modules/audio_device/win/audio_device_wave_win.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/tick_util.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/tick_util.h" +#include "webrtc/system_wrappers/include/trace.h" #include #include // CoTaskMemAlloc, CoTaskMemFree diff --git a/webrtc/modules/audio_device/win/audio_device_wave_win.h b/webrtc/modules/audio_device/win/audio_device_wave_win.h index fd43e94fee..c99185c3ab 100644 --- a/webrtc/modules/audio_device/win/audio_device_wave_win.h +++ b/webrtc/modules/audio_device/win/audio_device_wave_win.h @@ -13,7 +13,7 @@ #include "webrtc/modules/audio_device/audio_device_generic.h" #include "webrtc/modules/audio_device/win/audio_mixer_manager_win.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" #pragma comment( lib, "winmm.lib" ) diff --git a/webrtc/modules/audio_device/win/audio_mixer_manager_win.cc b/webrtc/modules/audio_device/win/audio_mixer_manager_win.cc index 79076d39a7..368b54c746 100644 --- a/webrtc/modules/audio_device/win/audio_mixer_manager_win.cc +++ b/webrtc/modules/audio_device/win/audio_mixer_manager_win.cc @@ -9,7 +9,7 @@ */ #include "webrtc/modules/audio_device/win/audio_mixer_manager_win.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" #include // assert() #include // StringCchCopy(), StringCchCat(), StringCchPrintf() diff --git a/webrtc/modules/audio_device/win/audio_mixer_manager_win.h b/webrtc/modules/audio_device/win/audio_mixer_manager_win.h index 52b46e0201..1e0ab47ad4 100644 --- a/webrtc/modules/audio_device/win/audio_mixer_manager_win.h +++ b/webrtc/modules/audio_device/win/audio_mixer_manager_win.h @@ -13,7 +13,7 @@ #include "webrtc/typedefs.h" #include "webrtc/modules/audio_device/include/audio_device.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include #include diff --git a/webrtc/modules/audio_processing/aec/aec_core.c b/webrtc/modules/audio_processing/aec/aec_core.c index b2162ac0b9..f8eed32372 100644 --- a/webrtc/modules/audio_processing/aec/aec_core.c +++ b/webrtc/modules/audio_processing/aec/aec_core.c @@ -31,7 +31,7 @@ #include "webrtc/modules/audio_processing/aec/aec_rdft.h" #include "webrtc/modules/audio_processing/logging/aec_logging.h" #include "webrtc/modules/audio_processing/utility/delay_estimator_wrapper.h" -#include "webrtc/system_wrappers/interface/cpu_features_wrapper.h" +#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_processing/aec/aec_rdft.c b/webrtc/modules/audio_processing/aec/aec_rdft.c index 2c3cff2df5..03efc103ea 100644 --- a/webrtc/modules/audio_processing/aec/aec_rdft.c +++ b/webrtc/modules/audio_processing/aec/aec_rdft.c @@ -23,7 +23,7 @@ #include -#include "webrtc/system_wrappers/interface/cpu_features_wrapper.h" +#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" #include "webrtc/typedefs.h" // These tables used to be computed at run-time. For example, refer to: diff --git a/webrtc/modules/audio_processing/aecm/aecm_core.c b/webrtc/modules/audio_processing/aecm/aecm_core.c index b801f07a95..f0d85d5328 100644 --- a/webrtc/modules/audio_processing/aecm/aecm_core.c +++ b/webrtc/modules/audio_processing/aecm/aecm_core.c @@ -18,8 +18,8 @@ #include "webrtc/common_audio/signal_processing/include/real_fft.h" #include "webrtc/modules/audio_processing/aecm/include/echo_control_mobile.h" #include "webrtc/modules/audio_processing/utility/delay_estimator_wrapper.h" -#include "webrtc/system_wrappers/interface/compile_assert_c.h" -#include "webrtc/system_wrappers/interface/cpu_features_wrapper.h" +#include "webrtc/system_wrappers/include/compile_assert_c.h" +#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" #include "webrtc/typedefs.h" #ifdef AEC_DEBUG diff --git a/webrtc/modules/audio_processing/aecm/aecm_core_c.c b/webrtc/modules/audio_processing/aecm/aecm_core_c.c index eb2bd918c8..df95e8bedf 100644 --- a/webrtc/modules/audio_processing/aecm/aecm_core_c.c +++ b/webrtc/modules/audio_processing/aecm/aecm_core_c.c @@ -18,8 +18,8 @@ #include "webrtc/common_audio/signal_processing/include/real_fft.h" #include "webrtc/modules/audio_processing/aecm/include/echo_control_mobile.h" #include "webrtc/modules/audio_processing/utility/delay_estimator_wrapper.h" -#include "webrtc/system_wrappers/interface/compile_assert_c.h" -#include "webrtc/system_wrappers/interface/cpu_features_wrapper.h" +#include "webrtc/system_wrappers/include/compile_assert_c.h" +#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" #include "webrtc/typedefs.h" // Square root of Hanning window in Q14. diff --git a/webrtc/modules/audio_processing/agc/agc_manager_direct.cc b/webrtc/modules/audio_processing/agc/agc_manager_direct.cc index 48ce2f877c..867022dcbf 100644 --- a/webrtc/modules/audio_processing/agc/agc_manager_direct.cc +++ b/webrtc/modules/audio_processing/agc/agc_manager_direct.cc @@ -20,7 +20,7 @@ #include "webrtc/modules/audio_processing/agc/gain_map_internal.h" #include "webrtc/modules/audio_processing/gain_control_impl.h" #include "webrtc/modules/interface/module_common_types.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/agc/agc_manager_direct_unittest.cc b/webrtc/modules/audio_processing/agc/agc_manager_direct_unittest.cc index 9dba2fc901..ce4db59139 100644 --- a/webrtc/modules/audio_processing/agc/agc_manager_direct_unittest.cc +++ b/webrtc/modules/audio_processing/agc/agc_manager_direct_unittest.cc @@ -15,7 +15,7 @@ #include "webrtc/common_types.h" #include "webrtc/modules/audio_processing/agc/mock_agc.h" #include "webrtc/modules/audio_processing/include/mock_audio_processing.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/testsupport/trace_to_stderr.h" using ::testing::_; diff --git a/webrtc/modules/audio_processing/audio_buffer.h b/webrtc/modules/audio_processing/audio_buffer.h index f82ab61ecb..864633f267 100644 --- a/webrtc/modules/audio_processing/audio_buffer.h +++ b/webrtc/modules/audio_processing/audio_buffer.h @@ -16,7 +16,7 @@ #include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/modules/audio_processing/splitting_filter.h" #include "webrtc/modules/interface/module_common_types.h" -#include "webrtc/system_wrappers/interface/scoped_vector.h" +#include "webrtc/system_wrappers/include/scoped_vector.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/audio_processing_impl.cc b/webrtc/modules/audio_processing/audio_processing_impl.cc index f3ee0a399d..2a54a1a109 100644 --- a/webrtc/modules/audio_processing/audio_processing_impl.cc +++ b/webrtc/modules/audio_processing/audio_processing_impl.cc @@ -37,10 +37,10 @@ extern "C" { #include "webrtc/modules/audio_processing/transient/transient_suppressor.h" #include "webrtc/modules/audio_processing/voice_detection_impl.h" #include "webrtc/modules/interface/module_common_types.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/file_wrapper.h" -#include "webrtc/system_wrappers/interface/logging.h" -#include "webrtc/system_wrappers/interface/metrics.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/file_wrapper.h" +#include "webrtc/system_wrappers/include/logging.h" +#include "webrtc/system_wrappers/include/metrics.h" #ifdef WEBRTC_AUDIOPROC_DEBUG_DUMP // Files generated at build-time by the protobuf compiler. diff --git a/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.h b/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.h index 4c79c01143..62d5d69168 100644 --- a/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.h +++ b/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.h @@ -17,7 +17,7 @@ #include "webrtc/common_audio/channel_buffer.h" #include "webrtc/modules/audio_processing/beamformer/beamformer.h" #include "webrtc/modules/audio_processing/beamformer/complex_matrix.h" -#include "webrtc/system_wrappers/interface/scoped_vector.h" +#include "webrtc/system_wrappers/include/scoped_vector.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/echo_cancellation_impl.cc b/webrtc/modules/audio_processing/echo_cancellation_impl.cc index 567d9a47f8..56ee9e0fff 100644 --- a/webrtc/modules/audio_processing/echo_cancellation_impl.cc +++ b/webrtc/modules/audio_processing/echo_cancellation_impl.cc @@ -18,7 +18,7 @@ extern "C" { } #include "webrtc/modules/audio_processing/aec/include/echo_cancellation.h" #include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/echo_control_mobile_impl.cc b/webrtc/modules/audio_processing/echo_control_mobile_impl.cc index 8d5ec9c4e2..954aac7d4a 100644 --- a/webrtc/modules/audio_processing/echo_control_mobile_impl.cc +++ b/webrtc/modules/audio_processing/echo_control_mobile_impl.cc @@ -15,8 +15,8 @@ #include "webrtc/modules/audio_processing/aecm/include/echo_control_mobile.h" #include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/gain_control_impl.cc b/webrtc/modules/audio_processing/gain_control_impl.cc index 8a3612dce5..3b1537e796 100644 --- a/webrtc/modules/audio_processing/gain_control_impl.cc +++ b/webrtc/modules/audio_processing/gain_control_impl.cc @@ -14,7 +14,7 @@ #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/agc/legacy/gain_control.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/high_pass_filter_impl.cc b/webrtc/modules/audio_processing/high_pass_filter_impl.cc index 6302f13fcf..29e482078e 100644 --- a/webrtc/modules/audio_processing/high_pass_filter_impl.cc +++ b/webrtc/modules/audio_processing/high_pass_filter_impl.cc @@ -14,7 +14,7 @@ #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_processing/intelligibility/test/intelligibility_proc.cc b/webrtc/modules/audio_processing/intelligibility/test/intelligibility_proc.cc index e20429da3f..27d0ab48bb 100644 --- a/webrtc/modules/audio_processing/intelligibility/test/intelligibility_proc.cc +++ b/webrtc/modules/audio_processing/intelligibility/test/intelligibility_proc.cc @@ -27,7 +27,7 @@ #include "webrtc/common_audio/wav_file.h" #include "webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.h" #include "webrtc/modules/audio_processing/intelligibility/intelligibility_utils.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/test/testsupport/fileutils.h" using std::complex; diff --git a/webrtc/modules/audio_processing/level_estimator_impl.cc b/webrtc/modules/audio_processing/level_estimator_impl.cc index 26a61dcdb5..35fe697c2d 100644 --- a/webrtc/modules/audio_processing/level_estimator_impl.cc +++ b/webrtc/modules/audio_processing/level_estimator_impl.cc @@ -13,7 +13,7 @@ #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/modules/audio_processing/rms_level.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/noise_suppression_impl.cc b/webrtc/modules/audio_processing/noise_suppression_impl.cc index 1501911264..65ec3c445e 100644 --- a/webrtc/modules/audio_processing/noise_suppression_impl.cc +++ b/webrtc/modules/audio_processing/noise_suppression_impl.cc @@ -18,7 +18,7 @@ #elif defined(WEBRTC_NS_FIXED) #include "webrtc/modules/audio_processing/ns/include/noise_suppression_x.h" #endif -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/ns/nsx_core.c b/webrtc/modules/audio_processing/ns/nsx_core.c index ed6125aa78..71445792f5 100644 --- a/webrtc/modules/audio_processing/ns/nsx_core.c +++ b/webrtc/modules/audio_processing/ns/nsx_core.c @@ -17,7 +17,7 @@ #include "webrtc/common_audio/signal_processing/include/real_fft.h" #include "webrtc/modules/audio_processing/ns/nsx_core.h" -#include "webrtc/system_wrappers/interface/cpu_features_wrapper.h" +#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" #if (defined WEBRTC_DETECT_NEON || defined WEBRTC_HAS_NEON) /* Tables are defined in ARM assembly files. */ diff --git a/webrtc/modules/audio_processing/splitting_filter.h b/webrtc/modules/audio_processing/splitting_filter.h index 51088d5bdf..4698d3fe2b 100644 --- a/webrtc/modules/audio_processing/splitting_filter.h +++ b/webrtc/modules/audio_processing/splitting_filter.h @@ -15,7 +15,7 @@ #include #include "webrtc/modules/audio_processing/three_band_filter_bank.h" -#include "webrtc/system_wrappers/interface/scoped_vector.h" +#include "webrtc/system_wrappers/include/scoped_vector.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/test/audio_processing_unittest.cc b/webrtc/modules/audio_processing/test/audio_processing_unittest.cc index 3ebea13a45..809fd3b87e 100644 --- a/webrtc/modules/audio_processing/test/audio_processing_unittest.cc +++ b/webrtc/modules/audio_processing/test/audio_processing_unittest.cc @@ -25,8 +25,8 @@ #include "webrtc/modules/audio_processing/test/protobuf_utils.h" #include "webrtc/modules/audio_processing/test/test_utils.h" #include "webrtc/modules/interface/module_common_types.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/gtest_disable.h" #ifdef WEBRTC_ANDROID_PLATFORM_BUILD diff --git a/webrtc/modules/audio_processing/test/audioproc_float.cc b/webrtc/modules/audio_processing/test/audioproc_float.cc index 9c44d76ecc..88d636e825 100644 --- a/webrtc/modules/audio_processing/test/audioproc_float.cc +++ b/webrtc/modules/audio_processing/test/audioproc_float.cc @@ -20,7 +20,7 @@ #include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/modules/audio_processing/test/protobuf_utils.h" #include "webrtc/modules/audio_processing/test/test_utils.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/tick_util.h" #include "webrtc/test/testsupport/trace_to_stderr.h" DEFINE_string(dump, "", "The name of the debug dump file to read from."); diff --git a/webrtc/modules/audio_processing/test/process_test.cc b/webrtc/modules/audio_processing/test/process_test.cc index 715762f31e..43165404c8 100644 --- a/webrtc/modules/audio_processing/test/process_test.cc +++ b/webrtc/modules/audio_processing/test/process_test.cc @@ -23,8 +23,8 @@ #include "webrtc/modules/audio_processing/test/protobuf_utils.h" #include "webrtc/modules/audio_processing/test/test_utils.h" #include "webrtc/modules/interface/module_common_types.h" -#include "webrtc/system_wrappers/interface/cpu_features_wrapper.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" +#include "webrtc/system_wrappers/include/tick_util.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/perf_test.h" #ifdef WEBRTC_ANDROID_PLATFORM_BUILD diff --git a/webrtc/modules/audio_processing/three_band_filter_bank.h b/webrtc/modules/audio_processing/three_band_filter_bank.h index 18e8aee7c9..cb9cfbe7b1 100644 --- a/webrtc/modules/audio_processing/three_band_filter_bank.h +++ b/webrtc/modules/audio_processing/three_band_filter_bank.h @@ -15,7 +15,7 @@ #include #include "webrtc/common_audio/sparse_fir_filter.h" -#include "webrtc/system_wrappers/interface/scoped_vector.h" +#include "webrtc/system_wrappers/include/scoped_vector.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/transient/click_annotate.cc b/webrtc/modules/audio_processing/transient/click_annotate.cc index f913cfd716..38f7a8eede 100644 --- a/webrtc/modules/audio_processing/transient/click_annotate.cc +++ b/webrtc/modules/audio_processing/transient/click_annotate.cc @@ -16,7 +16,7 @@ #include "webrtc/modules/audio_processing/transient/transient_detector.h" #include "webrtc/modules/audio_processing/transient/file_utils.h" #include "webrtc/base/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/file_wrapper.h" +#include "webrtc/system_wrappers/include/file_wrapper.h" using rtc::scoped_ptr; using webrtc::FileWrapper; diff --git a/webrtc/modules/audio_processing/transient/file_utils.cc b/webrtc/modules/audio_processing/transient/file_utils.cc index 2325bd6cb2..e043286f80 100644 --- a/webrtc/modules/audio_processing/transient/file_utils.cc +++ b/webrtc/modules/audio_processing/transient/file_utils.cc @@ -11,7 +11,7 @@ #include "webrtc/modules/audio_processing/transient/file_utils.h" #include "webrtc/base/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/file_wrapper.h" +#include "webrtc/system_wrappers/include/file_wrapper.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/transient/file_utils.h b/webrtc/modules/audio_processing/transient/file_utils.h index dbc3b5f788..cc76953215 100644 --- a/webrtc/modules/audio_processing/transient/file_utils.h +++ b/webrtc/modules/audio_processing/transient/file_utils.h @@ -13,7 +13,7 @@ #include -#include "webrtc/system_wrappers/interface/file_wrapper.h" +#include "webrtc/system_wrappers/include/file_wrapper.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/transient/file_utils_unittest.cc b/webrtc/modules/audio_processing/transient/file_utils_unittest.cc index a5240f830a..7a035d2b41 100644 --- a/webrtc/modules/audio_processing/transient/file_utils_unittest.cc +++ b/webrtc/modules/audio_processing/transient/file_utils_unittest.cc @@ -15,7 +15,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/base/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/file_wrapper.h" +#include "webrtc/system_wrappers/include/file_wrapper.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/gtest_disable.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_processing/transient/transient_detector_unittest.cc b/webrtc/modules/audio_processing/transient/transient_detector_unittest.cc index c45aaa8250..6a70a3f92c 100644 --- a/webrtc/modules/audio_processing/transient/transient_detector_unittest.cc +++ b/webrtc/modules/audio_processing/transient/transient_detector_unittest.cc @@ -17,7 +17,7 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/modules/audio_processing/transient/common.h" #include "webrtc/modules/audio_processing/transient/file_utils.h" -#include "webrtc/system_wrappers/interface/file_wrapper.h" +#include "webrtc/system_wrappers/include/file_wrapper.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/gtest_disable.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_processing/transient/transient_suppressor.cc b/webrtc/modules/audio_processing/transient/transient_suppressor.cc index 206d14db75..c8d9e65858 100644 --- a/webrtc/modules/audio_processing/transient/transient_suppressor.cc +++ b/webrtc/modules/audio_processing/transient/transient_suppressor.cc @@ -24,7 +24,7 @@ #include "webrtc/modules/audio_processing/transient/common.h" #include "webrtc/modules/audio_processing/transient/transient_detector.h" #include "webrtc/modules/audio_processing/ns/windows_private.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/transient/wpd_tree_unittest.cc b/webrtc/modules/audio_processing/transient/wpd_tree_unittest.cc index f242f93ff9..7c99f4f161 100644 --- a/webrtc/modules/audio_processing/transient/wpd_tree_unittest.cc +++ b/webrtc/modules/audio_processing/transient/wpd_tree_unittest.cc @@ -17,7 +17,7 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/modules/audio_processing/transient/daubechies_8_wavelet_coeffs.h" #include "webrtc/modules/audio_processing/transient/file_utils.h" -#include "webrtc/system_wrappers/interface/file_wrapper.h" +#include "webrtc/system_wrappers/include/file_wrapper.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/gtest_disable.h" diff --git a/webrtc/modules/audio_processing/utility/delay_estimator_wrapper.c b/webrtc/modules/audio_processing/utility/delay_estimator_wrapper.c index 270588f38c..b5448bc5bd 100644 --- a/webrtc/modules/audio_processing/utility/delay_estimator_wrapper.c +++ b/webrtc/modules/audio_processing/utility/delay_estimator_wrapper.c @@ -16,7 +16,7 @@ #include "webrtc/modules/audio_processing/utility/delay_estimator.h" #include "webrtc/modules/audio_processing/utility/delay_estimator_internal.h" -#include "webrtc/system_wrappers/interface/compile_assert_c.h" +#include "webrtc/system_wrappers/include/compile_assert_c.h" // Only bit |kBandFirst| through bit |kBandLast| are processed and // |kBandFirst| - |kBandLast| must be < 32. diff --git a/webrtc/modules/audio_processing/voice_detection_impl.cc b/webrtc/modules/audio_processing/voice_detection_impl.cc index 710df4233f..374189e709 100644 --- a/webrtc/modules/audio_processing/voice_detection_impl.cc +++ b/webrtc/modules/audio_processing/voice_detection_impl.cc @@ -14,7 +14,7 @@ #include "webrtc/common_audio/vad/include/webrtc_vad.h" #include "webrtc/modules/audio_processing/audio_buffer.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/bitrate_controller/include/bitrate_allocator.h b/webrtc/modules/bitrate_controller/include/bitrate_allocator.h index 5c58f569d2..34b9ed5328 100644 --- a/webrtc/modules/bitrate_controller/include/bitrate_allocator.h +++ b/webrtc/modules/bitrate_controller/include/bitrate_allocator.h @@ -21,7 +21,7 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/thread_annotations.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.cc b/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.cc index fb9941a3b1..9fa7b0dfc0 100644 --- a/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.cc +++ b/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.cc @@ -13,9 +13,9 @@ #include #include "webrtc/base/checks.h" -#include "webrtc/system_wrappers/interface/field_trial.h" -#include "webrtc/system_wrappers/interface/logging.h" -#include "webrtc/system_wrappers/interface/metrics.h" +#include "webrtc/system_wrappers/include/field_trial.h" +#include "webrtc/system_wrappers/include/logging.h" +#include "webrtc/system_wrappers/include/metrics.h" namespace webrtc { namespace { diff --git a/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h b/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h index 74ac1fcb85..40061d3ee7 100644 --- a/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h +++ b/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h @@ -16,7 +16,7 @@ #include #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" namespace webrtc { class SendSideBandwidthEstimation { diff --git a/webrtc/modules/desktop_capture/cropping_window_capturer.cc b/webrtc/modules/desktop_capture/cropping_window_capturer.cc index 54a1c4186f..1e37e782ff 100644 --- a/webrtc/modules/desktop_capture/cropping_window_capturer.cc +++ b/webrtc/modules/desktop_capture/cropping_window_capturer.cc @@ -11,7 +11,7 @@ #include "webrtc/modules/desktop_capture/cropping_window_capturer.h" #include "webrtc/modules/desktop_capture/cropped_desktop_frame.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/cropping_window_capturer_win.cc b/webrtc/modules/desktop_capture/cropping_window_capturer_win.cc index 73a2aa9d6e..fe696eba67 100644 --- a/webrtc/modules/desktop_capture/cropping_window_capturer_win.cc +++ b/webrtc/modules/desktop_capture/cropping_window_capturer_win.cc @@ -14,7 +14,7 @@ #include "webrtc/modules/desktop_capture/win/scoped_gdi_object.h" #include "webrtc/modules/desktop_capture/win/screen_capture_utils.h" #include "webrtc/modules/desktop_capture/win/window_capture_utils.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc b/webrtc/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc index 7fdfa1c4b9..bee9e087f9 100644 --- a/webrtc/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc +++ b/webrtc/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc @@ -17,7 +17,7 @@ #include "webrtc/modules/desktop_capture/mouse_cursor.h" #include "webrtc/modules/desktop_capture/shared_desktop_frame.h" #include "webrtc/modules/desktop_capture/window_capturer.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/desktop_frame_win.cc b/webrtc/modules/desktop_capture/desktop_frame_win.cc index c6d7ccfcb9..6b97b132d8 100644 --- a/webrtc/modules/desktop_capture/desktop_frame_win.cc +++ b/webrtc/modules/desktop_capture/desktop_frame_win.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/desktop_capture/desktop_frame_win.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/differ.cc b/webrtc/modules/desktop_capture/differ.cc index 0f53b78e0c..8140e612a1 100644 --- a/webrtc/modules/desktop_capture/differ.cc +++ b/webrtc/modules/desktop_capture/differ.cc @@ -13,7 +13,7 @@ #include "string.h" #include "webrtc/modules/desktop_capture/differ_block.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/differ_block.cc b/webrtc/modules/desktop_capture/differ_block.cc index abae0d66f4..0dcb377411 100644 --- a/webrtc/modules/desktop_capture/differ_block.cc +++ b/webrtc/modules/desktop_capture/differ_block.cc @@ -14,7 +14,7 @@ #include "build/build_config.h" #include "webrtc/modules/desktop_capture/differ_block_sse2.h" -#include "webrtc/system_wrappers/interface/cpu_features_wrapper.h" +#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/differ_block_unittest.cc b/webrtc/modules/desktop_capture/differ_block_unittest.cc index 4f79eed983..df9f4d517a 100644 --- a/webrtc/modules/desktop_capture/differ_block_unittest.cc +++ b/webrtc/modules/desktop_capture/differ_block_unittest.cc @@ -10,7 +10,7 @@ #include "testing/gmock/include/gmock/gmock.h" #include "webrtc/modules/desktop_capture/differ_block.h" -#include "webrtc/system_wrappers/interface/ref_count.h" +#include "webrtc/system_wrappers/include/ref_count.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/mac/desktop_configuration.mm b/webrtc/modules/desktop_capture/mac/desktop_configuration.mm index cb39cd557a..9e483e5b81 100644 --- a/webrtc/modules/desktop_capture/mac/desktop_configuration.mm +++ b/webrtc/modules/desktop_capture/mac/desktop_configuration.mm @@ -14,7 +14,7 @@ #include #include -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" #if !defined(MAC_OS_X_VERSION_10_7) || \ MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7 diff --git a/webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.cc b/webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.cc index f0d5c34be6..eeccecb6cc 100644 --- a/webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.cc +++ b/webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.cc @@ -11,8 +11,8 @@ #include "webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.h" #include "webrtc/modules/desktop_capture/mac/desktop_configuration.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.h b/webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.h index fe6f01beb9..b2fa81a416 100644 --- a/webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.h +++ b/webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.h @@ -17,7 +17,7 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/modules/desktop_capture/mac/desktop_configuration.h" -#include "webrtc/system_wrappers/interface/atomic32.h" +#include "webrtc/system_wrappers/include/atomic32.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector.cc b/webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector.cc index 23c432f60f..84579c4149 100644 --- a/webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector.cc +++ b/webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector.cc @@ -17,7 +17,7 @@ #include "webrtc/base/macutils.h" #include "webrtc/modules/desktop_capture/mac/desktop_configuration.h" #include "webrtc/modules/desktop_capture/mac/window_list_utils.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector.h b/webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector.h index bddc8099b2..4e6008966e 100644 --- a/webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector.h +++ b/webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector.h @@ -14,8 +14,8 @@ #include #include "webrtc/modules/desktop_capture/window_capturer.h" -#include "webrtc/system_wrappers/interface/atomic32.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/atomic32.h" +#include "webrtc/system_wrappers/include/tick_util.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/mouse_cursor_monitor_mac.mm b/webrtc/modules/desktop_capture/mouse_cursor_monitor_mac.mm index deda9ce97c..6033127ae1 100644 --- a/webrtc/modules/desktop_capture/mouse_cursor_monitor_mac.mm +++ b/webrtc/modules/desktop_capture/mouse_cursor_monitor_mac.mm @@ -24,7 +24,7 @@ #include "webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.h" #include "webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector.h" #include "webrtc/modules/desktop_capture/mouse_cursor.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc b/webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc index 7238628057..5d5a81caba 100644 --- a/webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc +++ b/webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc @@ -16,7 +16,7 @@ #include "webrtc/modules/desktop_capture/desktop_frame.h" #include "webrtc/modules/desktop_capture/mouse_cursor.h" #include "webrtc/modules/desktop_capture/window_capturer.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/mouse_cursor_monitor_win.cc b/webrtc/modules/desktop_capture/mouse_cursor_monitor_win.cc index 3f4991e013..54dfba2032 100644 --- a/webrtc/modules/desktop_capture/mouse_cursor_monitor_win.cc +++ b/webrtc/modules/desktop_capture/mouse_cursor_monitor_win.cc @@ -16,7 +16,7 @@ #include "webrtc/modules/desktop_capture/mouse_cursor.h" #include "webrtc/modules/desktop_capture/win/cursor.h" #include "webrtc/modules/desktop_capture/win/window_capture_utils.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.cc b/webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.cc index ae89587ded..fc6d76eb7a 100644 --- a/webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.cc +++ b/webrtc/modules/desktop_capture/mouse_cursor_monitor_x11.cc @@ -19,7 +19,7 @@ #include "webrtc/modules/desktop_capture/desktop_frame.h" #include "webrtc/modules/desktop_capture/mouse_cursor.h" #include "webrtc/modules/desktop_capture/x11/x_error_trap.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" namespace { diff --git a/webrtc/modules/desktop_capture/screen_capture_frame_queue.cc b/webrtc/modules/desktop_capture/screen_capture_frame_queue.cc index 45a3507b92..94d8a27b13 100644 --- a/webrtc/modules/desktop_capture/screen_capture_frame_queue.cc +++ b/webrtc/modules/desktop_capture/screen_capture_frame_queue.cc @@ -15,7 +15,7 @@ #include "webrtc/modules/desktop_capture/desktop_frame.h" #include "webrtc/modules/desktop_capture/shared_desktop_frame.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/screen_capturer_helper.cc b/webrtc/modules/desktop_capture/screen_capturer_helper.cc index 86761c170f..fa7096d24d 100644 --- a/webrtc/modules/desktop_capture/screen_capturer_helper.cc +++ b/webrtc/modules/desktop_capture/screen_capturer_helper.cc @@ -13,7 +13,7 @@ #include #include -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/screen_capturer_helper.h b/webrtc/modules/desktop_capture/screen_capturer_helper.h index cc60203da0..da1f2bfeeb 100644 --- a/webrtc/modules/desktop_capture/screen_capturer_helper.h +++ b/webrtc/modules/desktop_capture/screen_capturer_helper.h @@ -14,7 +14,7 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/modules/desktop_capture/desktop_geometry.h" #include "webrtc/modules/desktop_capture/desktop_region.h" -#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h" +#include "webrtc/system_wrappers/include/rw_lock_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/screen_capturer_mac.mm b/webrtc/modules/desktop_capture/screen_capturer_mac.mm index 8da56d2f76..a0f0e5464e 100644 --- a/webrtc/modules/desktop_capture/screen_capturer_mac.mm +++ b/webrtc/modules/desktop_capture/screen_capturer_mac.mm @@ -31,8 +31,8 @@ #include "webrtc/modules/desktop_capture/mac/scoped_pixel_buffer_object.h" #include "webrtc/modules/desktop_capture/screen_capture_frame_queue.h" #include "webrtc/modules/desktop_capture/screen_capturer_helper.h" -#include "webrtc/system_wrappers/interface/logging.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/logging.h" +#include "webrtc/system_wrappers/include/tick_util.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/screen_capturer_x11.cc b/webrtc/modules/desktop_capture/screen_capturer_x11.cc index e34beda7b7..3a3c418654 100644 --- a/webrtc/modules/desktop_capture/screen_capturer_x11.cc +++ b/webrtc/modules/desktop_capture/screen_capturer_x11.cc @@ -26,8 +26,8 @@ #include "webrtc/modules/desktop_capture/screen_capture_frame_queue.h" #include "webrtc/modules/desktop_capture/screen_capturer_helper.h" #include "webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h" -#include "webrtc/system_wrappers/interface/logging.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/logging.h" +#include "webrtc/system_wrappers/include/tick_util.h" namespace webrtc { namespace { diff --git a/webrtc/modules/desktop_capture/shared_desktop_frame.cc b/webrtc/modules/desktop_capture/shared_desktop_frame.cc index 97190e0473..1f1aefa13b 100644 --- a/webrtc/modules/desktop_capture/shared_desktop_frame.cc +++ b/webrtc/modules/desktop_capture/shared_desktop_frame.cc @@ -11,7 +11,7 @@ #include "webrtc/modules/desktop_capture/shared_desktop_frame.h" #include "webrtc/base/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/atomic32.h" +#include "webrtc/system_wrappers/include/atomic32.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/win/cursor.cc b/webrtc/modules/desktop_capture/win/cursor.cc index cabe5656dc..a3acaf822b 100644 --- a/webrtc/modules/desktop_capture/win/cursor.cc +++ b/webrtc/modules/desktop_capture/win/cursor.cc @@ -17,7 +17,7 @@ #include "webrtc/modules/desktop_capture/desktop_frame.h" #include "webrtc/modules/desktop_capture/desktop_geometry.h" #include "webrtc/modules/desktop_capture/mouse_cursor.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/win/desktop.cc b/webrtc/modules/desktop_capture/win/desktop.cc index e665751636..97bbfb717b 100644 --- a/webrtc/modules/desktop_capture/win/desktop.cc +++ b/webrtc/modules/desktop_capture/win/desktop.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/win/scoped_thread_desktop.cc b/webrtc/modules/desktop_capture/win/scoped_thread_desktop.cc index 5666fc8977..12f9e89e96 100644 --- a/webrtc/modules/desktop_capture/win/scoped_thread_desktop.cc +++ b/webrtc/modules/desktop_capture/win/scoped_thread_desktop.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/desktop_capture/win/scoped_thread_desktop.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" #include "webrtc/modules/desktop_capture/win/desktop.h" diff --git a/webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.cc b/webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.cc index 4d76fce0fa..3cf64879f9 100644 --- a/webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.cc +++ b/webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.cc @@ -21,8 +21,8 @@ #include "webrtc/modules/desktop_capture/win/cursor.h" #include "webrtc/modules/desktop_capture/win/desktop.h" #include "webrtc/modules/desktop_capture/win/screen_capture_utils.h" -#include "webrtc/system_wrappers/interface/logging.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/logging.h" +#include "webrtc/system_wrappers/include/tick_util.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.cc b/webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.cc index e6087f1123..db40478023 100644 --- a/webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.cc +++ b/webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.cc @@ -21,8 +21,8 @@ #include "webrtc/modules/desktop_capture/win/cursor.h" #include "webrtc/modules/desktop_capture/win/desktop.h" #include "webrtc/modules/desktop_capture/win/screen_capture_utils.h" -#include "webrtc/system_wrappers/interface/logging.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/logging.h" +#include "webrtc/system_wrappers/include/tick_util.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.h b/webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.h index 9ad6b58d9b..f084e25442 100644 --- a/webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.h +++ b/webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.h @@ -21,7 +21,7 @@ #include "webrtc/modules/desktop_capture/screen_capturer.h" #include "webrtc/modules/desktop_capture/screen_capturer_helper.h" #include "webrtc/modules/desktop_capture/win/scoped_thread_desktop.h" -#include "webrtc/system_wrappers/interface/atomic32.h" +#include "webrtc/system_wrappers/include/atomic32.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/window_capturer_mac.mm b/webrtc/modules/desktop_capture/window_capturer_mac.mm index ecf6beeb2a..806fc5c1d4 100644 --- a/webrtc/modules/desktop_capture/window_capturer_mac.mm +++ b/webrtc/modules/desktop_capture/window_capturer_mac.mm @@ -22,8 +22,8 @@ #include "webrtc/modules/desktop_capture/mac/desktop_configuration.h" #include "webrtc/modules/desktop_capture/mac/full_screen_chrome_window_detector.h" #include "webrtc/modules/desktop_capture/mac/window_list_utils.h" -#include "webrtc/system_wrappers/interface/logging.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/logging.h" +#include "webrtc/system_wrappers/include/tick_util.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/window_capturer_unittest.cc b/webrtc/modules/desktop_capture/window_capturer_unittest.cc index 8b38bcd888..445a4e9848 100644 --- a/webrtc/modules/desktop_capture/window_capturer_unittest.cc +++ b/webrtc/modules/desktop_capture/window_capturer_unittest.cc @@ -15,7 +15,7 @@ #include "webrtc/modules/desktop_capture/desktop_capture_options.h" #include "webrtc/modules/desktop_capture/desktop_frame.h" #include "webrtc/modules/desktop_capture/desktop_region.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/window_capturer_win.cc b/webrtc/modules/desktop_capture/window_capturer_win.cc index 322a5340c9..c0d71167a5 100644 --- a/webrtc/modules/desktop_capture/window_capturer_win.cc +++ b/webrtc/modules/desktop_capture/window_capturer_win.cc @@ -17,7 +17,7 @@ #include "webrtc/base/win32.h" #include "webrtc/modules/desktop_capture/desktop_frame_win.h" #include "webrtc/modules/desktop_capture/win/window_capture_utils.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/window_capturer_x11.cc b/webrtc/modules/desktop_capture/window_capturer_x11.cc index 76c95eba47..f0d2c1284c 100755 --- a/webrtc/modules/desktop_capture/window_capturer_x11.cc +++ b/webrtc/modules/desktop_capture/window_capturer_x11.cc @@ -26,7 +26,7 @@ #include "webrtc/modules/desktop_capture/x11/shared_x_display.h" #include "webrtc/modules/desktop_capture/x11/x_error_trap.h" #include "webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/x11/shared_x_display.cc b/webrtc/modules/desktop_capture/x11/shared_x_display.cc index 9383715eda..3eb5eb10a9 100644 --- a/webrtc/modules/desktop_capture/x11/shared_x_display.cc +++ b/webrtc/modules/desktop_capture/x11/shared_x_display.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/x11/shared_x_display.h b/webrtc/modules/desktop_capture/x11/shared_x_display.h index 02755450fc..d905b9e51c 100644 --- a/webrtc/modules/desktop_capture/x11/shared_x_display.h +++ b/webrtc/modules/desktop_capture/x11/shared_x_display.h @@ -20,7 +20,7 @@ #include #include "webrtc/base/scoped_ref_ptr.h" -#include "webrtc/system_wrappers/interface/atomic32.h" +#include "webrtc/system_wrappers/include/atomic32.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc b/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc index be00fa7697..bcfcb7e027 100644 --- a/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc +++ b/webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.cc @@ -16,7 +16,7 @@ #include "webrtc/modules/desktop_capture/desktop_frame.h" #include "webrtc/modules/desktop_capture/x11/x_error_trap.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" namespace { diff --git a/webrtc/modules/media_file/source/media_file_impl.cc b/webrtc/modules/media_file/source/media_file_impl.cc index 83bb9b5355..50175b86d5 100644 --- a/webrtc/modules/media_file/source/media_file_impl.cc +++ b/webrtc/modules/media_file/source/media_file_impl.cc @@ -12,10 +12,10 @@ #include "webrtc/base/format_macros.h" #include "webrtc/modules/media_file/source/media_file_impl.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/file_wrapper.h" -#include "webrtc/system_wrappers/interface/tick_util.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/file_wrapper.h" +#include "webrtc/system_wrappers/include/tick_util.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { MediaFile* MediaFile::CreateMediaFile(const int32_t id) diff --git a/webrtc/modules/media_file/source/media_file_impl.h b/webrtc/modules/media_file/source/media_file_impl.h index c5038bbdf5..cdb54d880d 100644 --- a/webrtc/modules/media_file/source/media_file_impl.h +++ b/webrtc/modules/media_file/source/media_file_impl.h @@ -16,7 +16,7 @@ #include "webrtc/modules/media_file/interface/media_file.h" #include "webrtc/modules/media_file/interface/media_file_defines.h" #include "webrtc/modules/media_file/source/media_file_utility.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" namespace webrtc { class MediaFileImpl : public MediaFile diff --git a/webrtc/modules/media_file/source/media_file_unittest.cc b/webrtc/modules/media_file/source/media_file_unittest.cc index c21843cf21..370d13228a 100644 --- a/webrtc/modules/media_file/source/media_file_unittest.cc +++ b/webrtc/modules/media_file/source/media_file_unittest.cc @@ -10,7 +10,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/media_file/interface/media_file.h" -#include "webrtc/system_wrappers/interface/sleep.h" +#include "webrtc/system_wrappers/include/sleep.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/gtest_disable.h" diff --git a/webrtc/modules/media_file/source/media_file_utility.cc b/webrtc/modules/media_file/source/media_file_utility.cc index 85f045e5cf..61ae442d0e 100644 --- a/webrtc/modules/media_file/source/media_file_utility.cc +++ b/webrtc/modules/media_file/source/media_file_utility.cc @@ -20,8 +20,8 @@ #include "webrtc/common_types.h" #include "webrtc/engine_configurations.h" #include "webrtc/modules/interface/module_common_types.h" -#include "webrtc/system_wrappers/interface/file_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/file_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" namespace { diff --git a/webrtc/modules/pacing/bitrate_prober.cc b/webrtc/modules/pacing/bitrate_prober.cc index d09ad2df16..bbbe54f54e 100644 --- a/webrtc/modules/pacing/bitrate_prober.cc +++ b/webrtc/modules/pacing/bitrate_prober.cc @@ -16,7 +16,7 @@ #include #include "webrtc/modules/pacing/include/paced_sender.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { diff --git a/webrtc/modules/pacing/include/mock/mock_paced_sender.h b/webrtc/modules/pacing/include/mock/mock_paced_sender.h index 632ec9bd05..b2cefdff8b 100644 --- a/webrtc/modules/pacing/include/mock/mock_paced_sender.h +++ b/webrtc/modules/pacing/include/mock/mock_paced_sender.h @@ -16,7 +16,7 @@ #include #include "webrtc/modules/pacing/include/paced_sender.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/pacing/paced_sender.cc b/webrtc/modules/pacing/paced_sender.cc index 6a7d19a251..5d7ae17b23 100644 --- a/webrtc/modules/pacing/paced_sender.cc +++ b/webrtc/modules/pacing/paced_sender.cc @@ -18,10 +18,10 @@ #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/modules/pacing/bitrate_prober.h" -#include "webrtc/system_wrappers/interface/clock.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/field_trial.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/clock.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/field_trial.h" +#include "webrtc/system_wrappers/include/logging.h" namespace { // Time limit in milliseconds between packet bursts. diff --git a/webrtc/modules/pacing/paced_sender_unittest.cc b/webrtc/modules/pacing/paced_sender_unittest.cc index 1e701ff8ea..c27444c5ac 100644 --- a/webrtc/modules/pacing/paced_sender_unittest.cc +++ b/webrtc/modules/pacing/paced_sender_unittest.cc @@ -13,7 +13,7 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/pacing/include/paced_sender.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" using testing::_; using testing::Return; diff --git a/webrtc/modules/remote_bitrate_estimator/overuse_detector.cc b/webrtc/modules/remote_bitrate_estimator/overuse_detector.cc index 62bb2e1cac..c9340892f2 100644 --- a/webrtc/modules/remote_bitrate_estimator/overuse_detector.cc +++ b/webrtc/modules/remote_bitrate_estimator/overuse_detector.cc @@ -20,8 +20,8 @@ #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" -#include "webrtc/system_wrappers/interface/field_trial.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/field_trial.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { diff --git a/webrtc/modules/remote_bitrate_estimator/overuse_estimator.cc b/webrtc/modules/remote_bitrate_estimator/overuse_estimator.cc index cf7df2673b..4be7b7493b 100644 --- a/webrtc/modules/remote_bitrate_estimator/overuse_estimator.cc +++ b/webrtc/modules/remote_bitrate_estimator/overuse_estimator.cc @@ -17,7 +17,7 @@ #include #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc index 522489e921..2dc32a7ee7 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc +++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc @@ -17,9 +17,9 @@ #include "webrtc/base/thread_annotations.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "webrtc/modules/pacing/include/paced_sender.h" -#include "webrtc/system_wrappers/interface/clock.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/clock.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/logging.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h index b5ec81568a..549c437faf 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h +++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h @@ -23,7 +23,7 @@ #include "webrtc/modules/remote_bitrate_estimator/overuse_detector.h" #include "webrtc/modules/remote_bitrate_estimator/overuse_estimator.h" #include "webrtc/modules/remote_bitrate_estimator/rate_statistics.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc index 08e076e540..f1a1cb6602 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc +++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc @@ -17,9 +17,9 @@ #include "webrtc/modules/remote_bitrate_estimator/overuse_detector.h" #include "webrtc/modules/remote_bitrate_estimator/overuse_estimator.h" #include "webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h" -#include "webrtc/system_wrappers/interface/clock.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/clock.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/logging.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h index 2816f8d97d..35fe7216a5 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h +++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h @@ -17,7 +17,7 @@ #include "webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "webrtc/modules/remote_bitrate_estimator/rate_statistics.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h index b4fe7139b4..606bb6c4e6 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h +++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h @@ -19,7 +19,7 @@ #include "webrtc/base/constructormagic.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" namespace webrtc { namespace testing { diff --git a/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.cc b/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.cc index de4aec0a77..b7f9f65dbc 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.cc +++ b/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.cc @@ -12,7 +12,7 @@ #include "webrtc/base/checks.h" #include "webrtc/base/logging.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" #include "webrtc/modules/pacing/include/packet_router.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h" diff --git a/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy_unittest.cc b/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy_unittest.cc index 5ebd921e7a..826a724e33 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy_unittest.cc +++ b/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy_unittest.cc @@ -14,7 +14,7 @@ #include "webrtc/modules/pacing/include/packet_router.h" #include "webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" using ::testing::_; using ::testing::InSequence; diff --git a/webrtc/modules/remote_bitrate_estimator/send_time_history_unittest.cc b/webrtc/modules/remote_bitrate_estimator/send_time_history_unittest.cc index 5e2b5f5903..b525813cdc 100644 --- a/webrtc/modules/remote_bitrate_estimator/send_time_history_unittest.cc +++ b/webrtc/modules/remote_bitrate_estimator/send_time_history_unittest.cc @@ -14,7 +14,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/remote_bitrate_estimator/include/send_time_history.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test.cc b/webrtc/modules/remote_bitrate_estimator/test/bwe_test.cc index 9d71323d01..f837638474 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test.cc +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test.cc @@ -19,7 +19,7 @@ #include "webrtc/modules/remote_bitrate_estimator/test/metric_recorder.h" #include "webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h" #include "webrtc/modules/remote_bitrate_estimator/test/packet_sender.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" #include "webrtc/test/testsupport/perf_test.h" using std::string; diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h index 1362c87037..6b24cf30a6 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h @@ -30,7 +30,7 @@ #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" #include "webrtc/modules/remote_bitrate_estimator/test/packet.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" #include "webrtc/test/random.h" namespace webrtc { diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.cc b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.cc index 9423313181..dcc08d8dde 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.cc +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.cc @@ -18,8 +18,8 @@ #include #include -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" namespace webrtc { namespace testing { diff --git a/webrtc/modules/remote_bitrate_estimator/test/packet_receiver.cc b/webrtc/modules/remote_bitrate_estimator/test/packet_receiver.cc index 0edfeca4a6..f70c212af7 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/packet_receiver.cc +++ b/webrtc/modules/remote_bitrate_estimator/test/packet_receiver.cc @@ -18,7 +18,7 @@ #include "webrtc/modules/remote_bitrate_estimator/test/bwe.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h" #include "webrtc/modules/rtp_rtcp/interface/receive_statistics.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" namespace webrtc { namespace testing { diff --git a/webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter_unittest.cc b/webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter_unittest.cc index 0ca118d107..b2bc646e2d 100644 --- a/webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter_unittest.cc +++ b/webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter_unittest.cc @@ -21,7 +21,7 @@ #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" #include "webrtc/modules/utility/interface/mock/mock_process_thread.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" using ::testing::_; using ::testing::Invoke; diff --git a/webrtc/modules/rtp_rtcp/interface/remote_ntp_time_estimator.h b/webrtc/modules/rtp_rtcp/interface/remote_ntp_time_estimator.h index b1bc09a9a3..0ffba212a6 100644 --- a/webrtc/modules/rtp_rtcp/interface/remote_ntp_time_estimator.h +++ b/webrtc/modules/rtp_rtcp/interface/remote_ntp_time_estimator.h @@ -12,7 +12,7 @@ #define WEBRTC_MODULES_RTP_RTCP_INTERFACE_REMOTE_NTP_TIME_ESTIMATOR_H_ #include "webrtc/base/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/rtp_to_ntp.h" +#include "webrtc/system_wrappers/include/rtp_to_ntp.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h b/webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h index a3474b6945..6936352aca 100644 --- a/webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h +++ b/webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h @@ -15,7 +15,7 @@ #include #include "webrtc/modules/interface/module_common_types.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" #include "webrtc/typedefs.h" #define RTCP_CNAME_SIZE 256 // RFC 3550 page 44, including null termination diff --git a/webrtc/modules/rtp_rtcp/source/bitrate.cc b/webrtc/modules/rtp_rtcp/source/bitrate.cc index 0d502213aa..4e9fc72c1f 100644 --- a/webrtc/modules/rtp_rtcp/source/bitrate.cc +++ b/webrtc/modules/rtp_rtcp/source/bitrate.cc @@ -11,7 +11,7 @@ #include "webrtc/modules/rtp_rtcp/source/bitrate.h" #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/dtmf_queue.h b/webrtc/modules/rtp_rtcp/source/dtmf_queue.h index 320f8f57a9..d1b3f5667c 100644 --- a/webrtc/modules/rtp_rtcp/source/dtmf_queue.h +++ b/webrtc/modules/rtp_rtcp/source/dtmf_queue.h @@ -12,7 +12,7 @@ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_DTMF_QUEUE_H_ #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/fec_receiver_impl.cc b/webrtc/modules/rtp_rtcp/source/fec_receiver_impl.cc index 7e71b62dbb..2109574e39 100644 --- a/webrtc/modules/rtp_rtcp/source/fec_receiver_impl.cc +++ b/webrtc/modules/rtp_rtcp/source/fec_receiver_impl.cc @@ -16,7 +16,7 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_video.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" // RFC 5109 namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/forward_error_correction.h b/webrtc/modules/rtp_rtcp/source/forward_error_correction.h index dbb3fa93e6..f92f014db3 100644 --- a/webrtc/modules/rtp_rtcp/source/forward_error_correction.h +++ b/webrtc/modules/rtp_rtcp/source/forward_error_correction.h @@ -16,7 +16,7 @@ #include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" -#include "webrtc/system_wrappers/interface/ref_count.h" +#include "webrtc/system_wrappers/include/ref_count.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc b/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc index 01116d6e60..8ac7e0a383 100644 --- a/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc +++ b/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc @@ -15,7 +15,7 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/modules/rtp_rtcp/source/bitrate.h" #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.h b/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.h index e9492298b9..fe42990fe9 100644 --- a/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.h +++ b/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.h @@ -17,7 +17,7 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/modules/rtp_rtcp/source/bitrate.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/receive_statistics_unittest.cc b/webrtc/modules/rtp_rtcp/source/receive_statistics_unittest.cc index fe9f71444e..5b522281df 100644 --- a/webrtc/modules/rtp_rtcp/source/receive_statistics_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/receive_statistics_unittest.cc @@ -12,7 +12,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/modules/rtp_rtcp/interface/receive_statistics.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/remote_ntp_time_estimator.cc b/webrtc/modules/rtp_rtcp/source/remote_ntp_time_estimator.cc index 30d8997fdd..74fc9cdc56 100644 --- a/webrtc/modules/rtp_rtcp/source/remote_ntp_time_estimator.cc +++ b/webrtc/modules/rtp_rtcp/source/remote_ntp_time_estimator.cc @@ -11,8 +11,8 @@ #include "webrtc/modules/rtp_rtcp/interface/remote_ntp_time_estimator.h" #include "webrtc/base/logging.h" -#include "webrtc/system_wrappers/interface/clock.h" -#include "webrtc/system_wrappers/interface/timestamp_extrapolator.h" +#include "webrtc/system_wrappers/include/clock.h" +#include "webrtc/system_wrappers/include/timestamp_extrapolator.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc b/webrtc/modules/rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc index 45817b01e6..bc9cf2ee39 100644 --- a/webrtc/modules/rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc @@ -12,7 +12,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/common_types.h" #include "webrtc/modules/rtp_rtcp/interface/remote_ntp_time_estimator.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" using ::testing::_; using ::testing::DoAll; diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc index 23a7a781fe..b914838109 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc @@ -21,7 +21,6 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h" #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" namespace webrtc { using namespace RTCPUtility; diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc b/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc index c60c17af67..22b9477e05 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc @@ -24,7 +24,7 @@ #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h" #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_header_parser.cc b/webrtc/modules/rtp_rtcp/source/rtp_header_parser.cc index 0b8280de1e..266bad8858 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_header_parser.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_header_parser.cc @@ -12,7 +12,7 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/modules/rtp_rtcp/source/rtp_header_extension.h" #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_packet_history.cc b/webrtc/modules/rtp_rtcp/source/rtp_packet_history.cc index a957eaae9b..aa941d63ff 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_packet_history.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_packet_history.cc @@ -19,7 +19,7 @@ #include "webrtc/base/checks.h" #include "webrtc/base/logging.h" #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc index 63c95935ca..00a6ac7ed2 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc @@ -14,7 +14,7 @@ #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/rtp_packet_history.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" #include "webrtc/video_engine/vie_defines.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.cc b/webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.cc index 619833223d..c4c7dbb4cd 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.cc @@ -16,7 +16,7 @@ #include "webrtc/base/logging.h" #include "webrtc/base/trace_event.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" namespace webrtc { RTPReceiverStrategy* RTPReceiverStrategy::CreateAudioStrategy( diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.h b/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.h index d6fbf2e468..46741d59b4 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.h @@ -15,7 +15,7 @@ #include "webrtc/modules/rtp_rtcp/interface/rtp_receiver.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.cc b/webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.cc index 5fae3db028..3797b1bcc2 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h b/webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h index a9e85ec450..37c3e6e49a 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h @@ -15,7 +15,7 @@ #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc b/webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc index a639348485..1af2d4857e 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc @@ -21,7 +21,7 @@ #include "webrtc/modules/rtp_rtcp/source/rtp_format.h" #include "webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.h" #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc index 4a924c99e7..451f8bfa93 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc @@ -17,7 +17,7 @@ #include "webrtc/base/checks.h" #include "webrtc/base/logging.h" #include "webrtc/common_types.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" #ifdef _WIN32 // Disable warning C4355: 'this' : used in base member initializer list. diff --git a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc index 03b91a9e33..4c94764ee6 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc @@ -16,7 +16,7 @@ #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h" -#include "webrtc/system_wrappers/interface/scoped_vector.h" +#include "webrtc/system_wrappers/include/scoped_vector.h" #include "webrtc/test/rtcp_packet_parser.h" using ::testing::_; diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc index 29be0dc61a..50f476829d 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc @@ -20,8 +20,8 @@ #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/rtp_sender_audio.h" #include "webrtc/modules/rtp_rtcp/source/rtp_sender_video.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/tick_util.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc index 9be888c92a..fde6d47ceb 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc @@ -24,7 +24,7 @@ #include "webrtc/modules/rtp_rtcp/source/rtp_header_extension.h" #include "webrtc/modules/rtp_rtcp/source/rtp_sender.h" #include "webrtc/modules/rtp_rtcp/source/rtp_sender_video.h" -#include "webrtc/system_wrappers/interface/stl_util.h" +#include "webrtc/system_wrappers/include/stl_util.h" #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" #include "webrtc/test/mock_transport.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc index 8c0e570fab..66062771de 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc @@ -24,7 +24,7 @@ #include "webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.h" #include "webrtc/modules/rtp_rtcp/source/rtp_format_vp8.h" #include "webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" namespace webrtc { enum { REDForFECHeaderLength = 1 }; diff --git a/webrtc/modules/rtp_rtcp/source/rtp_utility.cc b/webrtc/modules/rtp_rtcp/source/rtp_utility.cc index dde9d49bd0..bf0b30a064 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_utility.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_utility.cc @@ -29,7 +29,7 @@ #include "webrtc/base/logging.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/tick_util.h" #if (defined(_DEBUG) && defined(_WIN32) && (_MSC_VER >= 1400)) #define DEBUG_PRINT(...) \ diff --git a/webrtc/modules/rtp_rtcp/source/ssrc_database.cc b/webrtc/modules/rtp_rtcp/source/ssrc_database.cc index 4e23083385..6fb7c4701a 100644 --- a/webrtc/modules/rtp_rtcp/source/ssrc_database.cc +++ b/webrtc/modules/rtp_rtcp/source/ssrc_database.cc @@ -13,7 +13,7 @@ #include #include -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" #ifdef _WIN32 #include diff --git a/webrtc/modules/rtp_rtcp/source/ssrc_database.h b/webrtc/modules/rtp_rtcp/source/ssrc_database.h index 2d4932afa7..7129d0de76 100644 --- a/webrtc/modules/rtp_rtcp/source/ssrc_database.h +++ b/webrtc/modules/rtp_rtcp/source/ssrc_database.h @@ -13,7 +13,7 @@ #include -#include "webrtc/system_wrappers/interface/static_instance.h" +#include "webrtc/system_wrappers/include/static_instance.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/tmmbr_help.h b/webrtc/modules/rtp_rtcp/source/tmmbr_help.h index 5d44384b2f..b046e28a73 100644 --- a/webrtc/modules/rtp_rtcp/source/tmmbr_help.h +++ b/webrtc/modules/rtp_rtcp/source/tmmbr_help.h @@ -13,7 +13,7 @@ #include -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/test/BWEStandAlone/BWEStandAlone.cc b/webrtc/modules/rtp_rtcp/test/BWEStandAlone/BWEStandAlone.cc index ea8ac9876a..711be4a623 100644 --- a/webrtc/modules/rtp_rtcp/test/BWEStandAlone/BWEStandAlone.cc +++ b/webrtc/modules/rtp_rtcp/test/BWEStandAlone/BWEStandAlone.cc @@ -15,8 +15,8 @@ #include #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/channel_transport/udp_transport.h" #include "webrtc/modules/rtp_rtcp/test/BWEStandAlone/TestLoadGenerator.h" diff --git a/webrtc/modules/rtp_rtcp/test/BWEStandAlone/MatlabPlot.cc b/webrtc/modules/rtp_rtcp/test/BWEStandAlone/MatlabPlot.cc index 9e79a8cda8..fe54d67ee7 100644 --- a/webrtc/modules/rtp_rtcp/test/BWEStandAlone/MatlabPlot.cc +++ b/webrtc/modules/rtp_rtcp/test/BWEStandAlone/MatlabPlot.cc @@ -20,9 +20,9 @@ #include "engine.h" #endif -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/tick_util.h" using namespace webrtc; diff --git a/webrtc/modules/rtp_rtcp/test/BWEStandAlone/MatlabPlot.h b/webrtc/modules/rtp_rtcp/test/BWEStandAlone/MatlabPlot.h index 7623daab94..3ed89f8f91 100644 --- a/webrtc/modules/rtp_rtcp/test/BWEStandAlone/MatlabPlot.h +++ b/webrtc/modules/rtp_rtcp/test/BWEStandAlone/MatlabPlot.h @@ -16,7 +16,7 @@ #include #include "webrtc/typedefs.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" namespace webrtc { class CriticalSectionWrapper; diff --git a/webrtc/modules/rtp_rtcp/test/BWEStandAlone/TestLoadGenerator.cc b/webrtc/modules/rtp_rtcp/test/BWEStandAlone/TestLoadGenerator.cc index 0ed35728e4..0e3e87976c 100644 --- a/webrtc/modules/rtp_rtcp/test/BWEStandAlone/TestLoadGenerator.cc +++ b/webrtc/modules/rtp_rtcp/test/BWEStandAlone/TestLoadGenerator.cc @@ -15,9 +15,9 @@ #include #include "webrtc/modules/rtp_rtcp/test/BWEStandAlone/TestSenderReceiver.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/tick_util.h" bool SenderThreadFunction(void *obj) diff --git a/webrtc/modules/rtp_rtcp/test/BWEStandAlone/TestLoadGenerator.h b/webrtc/modules/rtp_rtcp/test/BWEStandAlone/TestLoadGenerator.h index fbd79177ea..bd83962fa3 100644 --- a/webrtc/modules/rtp_rtcp/test/BWEStandAlone/TestLoadGenerator.h +++ b/webrtc/modules/rtp_rtcp/test/BWEStandAlone/TestLoadGenerator.h @@ -14,7 +14,7 @@ #include #include "webrtc/modules/interface/module_common_types.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" #include "webrtc/typedefs.h" class TestSenderReceiver; diff --git a/webrtc/modules/rtp_rtcp/test/BWEStandAlone/TestSenderReceiver.cc b/webrtc/modules/rtp_rtcp/test/BWEStandAlone/TestSenderReceiver.cc index f3ca282667..47f2880638 100644 --- a/webrtc/modules/rtp_rtcp/test/BWEStandAlone/TestSenderReceiver.cc +++ b/webrtc/modules/rtp_rtcp/test/BWEStandAlone/TestSenderReceiver.cc @@ -15,9 +15,9 @@ #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h" #include "webrtc/modules/rtp_rtcp/test/BWEStandAlone/TestLoadGenerator.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/tick_util.h" #include "webrtc/test/channel_transport/udp_transport.h" #define NR_OF_SOCKET_BUFFERS 500 diff --git a/webrtc/modules/rtp_rtcp/test/BWEStandAlone/TestSenderReceiver.h b/webrtc/modules/rtp_rtcp/test/BWEStandAlone/TestSenderReceiver.h index 49cab586a3..f394412a73 100644 --- a/webrtc/modules/rtp_rtcp/test/BWEStandAlone/TestSenderReceiver.h +++ b/webrtc/modules/rtp_rtcp/test/BWEStandAlone/TestSenderReceiver.h @@ -13,7 +13,7 @@ #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" #include "webrtc/test/channel_transport/udp_transport.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/utility/interface/file_recorder.h b/webrtc/modules/utility/interface/file_recorder.h index 1e12673eeb..f2ce785368 100644 --- a/webrtc/modules/utility/interface/file_recorder.h +++ b/webrtc/modules/utility/interface/file_recorder.h @@ -15,7 +15,7 @@ #include "webrtc/engine_configurations.h" #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/modules/media_file/interface/media_file_defines.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/tick_util.h" #include "webrtc/typedefs.h" #include "webrtc/video_frame.h" diff --git a/webrtc/modules/utility/source/file_player_impl.cc b/webrtc/modules/utility/source/file_player_impl.cc index 29ad9e3fe1..e783a7eca8 100644 --- a/webrtc/modules/utility/source/file_player_impl.cc +++ b/webrtc/modules/utility/source/file_player_impl.cc @@ -9,7 +9,7 @@ */ #include "webrtc/modules/utility/source/file_player_impl.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { FilePlayer* FilePlayer::CreateFilePlayer(uint32_t instanceID, diff --git a/webrtc/modules/utility/source/file_player_impl.h b/webrtc/modules/utility/source/file_player_impl.h index 8818b5caad..f411db9151 100644 --- a/webrtc/modules/utility/source/file_player_impl.h +++ b/webrtc/modules/utility/source/file_player_impl.h @@ -18,8 +18,8 @@ #include "webrtc/modules/media_file/interface/media_file_defines.h" #include "webrtc/modules/utility/interface/file_player.h" #include "webrtc/modules/utility/source/coder.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/tick_util.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/utility/source/file_recorder_impl.cc b/webrtc/modules/utility/source/file_recorder_impl.cc index c11bbe993f..13926deb4a 100644 --- a/webrtc/modules/utility/source/file_recorder_impl.cc +++ b/webrtc/modules/utility/source/file_recorder_impl.cc @@ -12,7 +12,7 @@ #include "webrtc/engine_configurations.h" #include "webrtc/modules/media_file/interface/media_file.h" #include "webrtc/modules/utility/source/file_recorder_impl.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { FileRecorder* FileRecorder::CreateFileRecorder(uint32_t instanceID, diff --git a/webrtc/modules/utility/source/file_recorder_impl.h b/webrtc/modules/utility/source/file_recorder_impl.h index b4f507e6a7..8ea96bdad4 100644 --- a/webrtc/modules/utility/source/file_recorder_impl.h +++ b/webrtc/modules/utility/source/file_recorder_impl.h @@ -25,9 +25,9 @@ #include "webrtc/modules/media_file/interface/media_file_defines.h" #include "webrtc/modules/utility/interface/file_recorder.h" #include "webrtc/modules/utility/source/coder.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" +#include "webrtc/system_wrappers/include/tick_util.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/utility/source/process_thread_impl.cc b/webrtc/modules/utility/source/process_thread_impl.cc index df56fe39be..04fa88739f 100644 --- a/webrtc/modules/utility/source/process_thread_impl.cc +++ b/webrtc/modules/utility/source/process_thread_impl.cc @@ -12,8 +12,8 @@ #include "webrtc/base/checks.h" #include "webrtc/modules/interface/module.h" -#include "webrtc/system_wrappers/interface/logging.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/logging.h" +#include "webrtc/system_wrappers/include/tick_util.h" namespace webrtc { namespace { diff --git a/webrtc/modules/utility/source/process_thread_impl.h b/webrtc/modules/utility/source/process_thread_impl.h index 5101ea9ad0..4e5861b41e 100644 --- a/webrtc/modules/utility/source/process_thread_impl.h +++ b/webrtc/modules/utility/source/process_thread_impl.h @@ -17,8 +17,8 @@ #include "webrtc/base/criticalsection.h" #include "webrtc/base/thread_checker.h" #include "webrtc/modules/utility/interface/process_thread.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/utility/source/process_thread_impl_unittest.cc b/webrtc/modules/utility/source/process_thread_impl_unittest.cc index 457a369316..e080545312 100644 --- a/webrtc/modules/utility/source/process_thread_impl_unittest.cc +++ b/webrtc/modules/utility/source/process_thread_impl_unittest.cc @@ -12,7 +12,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/interface/module.h" #include "webrtc/modules/utility/source/process_thread_impl.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/tick_util.h" namespace webrtc { diff --git a/webrtc/modules/video_capture/device_info_impl.cc b/webrtc/modules/video_capture/device_info_impl.cc index 3ad8790628..e1695561c1 100644 --- a/webrtc/modules/video_capture/device_info_impl.cc +++ b/webrtc/modules/video_capture/device_info_impl.cc @@ -13,7 +13,7 @@ #include "webrtc/modules/video_capture/device_info_impl.h" #include "webrtc/modules/video_capture/video_capture_config.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" #ifndef abs #define abs(a) (a>=0?a:-a) diff --git a/webrtc/modules/video_capture/device_info_impl.h b/webrtc/modules/video_capture/device_info_impl.h index 2573b2ef98..420808bcee 100644 --- a/webrtc/modules/video_capture/device_info_impl.h +++ b/webrtc/modules/video_capture/device_info_impl.h @@ -15,7 +15,7 @@ #include "webrtc/modules/video_capture/include/video_capture.h" #include "webrtc/modules/video_capture/video_capture_delay.h" -#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h" +#include "webrtc/system_wrappers/include/rw_lock_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/video_capture/external/video_capture_external.cc b/webrtc/modules/video_capture/external/video_capture_external.cc index ff0f1a45a9..29b161263c 100644 --- a/webrtc/modules/video_capture/external/video_capture_external.cc +++ b/webrtc/modules/video_capture/external/video_capture_external.cc @@ -9,7 +9,7 @@ */ #include "webrtc/modules/video_capture/video_capture_impl.h" -#include "webrtc/system_wrappers/interface/ref_count.h" +#include "webrtc/system_wrappers/include/ref_count.h" namespace webrtc { diff --git a/webrtc/modules/video_capture/ios/device_info_ios.mm b/webrtc/modules/video_capture/ios/device_info_ios.mm index 8cce2042fc..307e5d3605 100644 --- a/webrtc/modules/video_capture/ios/device_info_ios.mm +++ b/webrtc/modules/video_capture/ios/device_info_ios.mm @@ -19,7 +19,7 @@ #include "webrtc/modules/video_capture/ios/device_info_ios.h" #include "webrtc/modules/video_capture/ios/device_info_ios_objc.h" #include "webrtc/modules/video_capture/video_capture_impl.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" using namespace webrtc; using namespace videocapturemodule; diff --git a/webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.mm b/webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.mm index c8421596da..e36c83bad9 100644 --- a/webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.mm +++ b/webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.mm @@ -17,7 +17,7 @@ #import "webrtc/modules/video_capture/ios/device_info_ios_objc.h" #import "webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" using namespace webrtc; using namespace webrtc::videocapturemodule; diff --git a/webrtc/modules/video_capture/ios/video_capture_ios.mm b/webrtc/modules/video_capture/ios/video_capture_ios.mm index b36b0d4c38..ae9b7e0805 100644 --- a/webrtc/modules/video_capture/ios/video_capture_ios.mm +++ b/webrtc/modules/video_capture/ios/video_capture_ios.mm @@ -14,8 +14,8 @@ #include "webrtc/modules/video_capture/ios/device_info_ios_objc.h" #include "webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.h" -#include "webrtc/system_wrappers/interface/ref_count.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/ref_count.h" +#include "webrtc/system_wrappers/include/trace.h" using namespace webrtc; using namespace videocapturemodule; diff --git a/webrtc/modules/video_capture/linux/device_info_linux.cc b/webrtc/modules/video_capture/linux/device_info_linux.cc index 10c0981e34..d3a10abb56 100644 --- a/webrtc/modules/video_capture/linux/device_info_linux.cc +++ b/webrtc/modules/video_capture/linux/device_info_linux.cc @@ -20,8 +20,8 @@ //v4l includes #include -#include "webrtc/system_wrappers/interface/ref_count.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/ref_count.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc diff --git a/webrtc/modules/video_capture/linux/video_capture_linux.cc b/webrtc/modules/video_capture/linux/video_capture_linux.cc index 23703aa53d..fe99c7136f 100644 --- a/webrtc/modules/video_capture/linux/video_capture_linux.cc +++ b/webrtc/modules/video_capture/linux/video_capture_linux.cc @@ -22,9 +22,9 @@ #include #include "webrtc/modules/video_capture/linux/video_capture_linux.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/ref_count.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/ref_count.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { diff --git a/webrtc/modules/video_capture/linux/video_capture_linux.h b/webrtc/modules/video_capture/linux/video_capture_linux.h index b2e0f813c0..996f8e10ca 100644 --- a/webrtc/modules/video_capture/linux/video_capture_linux.h +++ b/webrtc/modules/video_capture/linux/video_capture_linux.h @@ -13,7 +13,7 @@ #include "webrtc/common_types.h" #include "webrtc/modules/video_capture/video_capture_impl.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit.mm b/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit.mm index 4f03e5e113..ad057b49db 100644 --- a/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit.mm +++ b/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit.mm @@ -12,8 +12,8 @@ #import "webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info_objc.h" #import "webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_objc.h" #include "webrtc/modules/video_capture/video_capture_config.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { diff --git a/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info.mm b/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info.mm index 311f8ac770..1251ecd830 100644 --- a/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info.mm +++ b/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info.mm @@ -11,7 +11,7 @@ #import "webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info_objc.h" #include "webrtc/modules/video_capture/include/video_capture.h" #include "webrtc/modules/video_capture/video_capture_config.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { diff --git a/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info_objc.mm b/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info_objc.mm index 2b18e1eca1..d3f2188bae 100644 --- a/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info_objc.mm +++ b/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info_objc.mm @@ -12,7 +12,7 @@ #import "webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info_objc.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" using namespace webrtc; diff --git a/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_objc.mm b/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_objc.mm index 4bbd8c4801..8a6d448a93 100644 --- a/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_objc.mm +++ b/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_objc.mm @@ -17,7 +17,7 @@ #import "webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_objc.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" using namespace webrtc; using namespace videocapturemodule; diff --git a/webrtc/modules/video_capture/mac/video_capture_mac.mm b/webrtc/modules/video_capture/mac/video_capture_mac.mm index aeb8de6ae4..a9dab96e93 100644 --- a/webrtc/modules/video_capture/mac/video_capture_mac.mm +++ b/webrtc/modules/video_capture/mac/video_capture_mac.mm @@ -18,8 +18,8 @@ #include "webrtc/modules/video_capture/device_info_impl.h" #include "webrtc/modules/video_capture/video_capture_config.h" #include "webrtc/modules/video_capture/video_capture_impl.h" -#include "webrtc/system_wrappers/interface/ref_count.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/ref_count.h" +#include "webrtc/system_wrappers/include/trace.h" // 10.4 support must be decided runtime. We will just decide which framework to // use at compile time "work" classes. One for QTKit, one for QuickTime diff --git a/webrtc/modules/video_capture/test/video_capture_unittest.cc b/webrtc/modules/video_capture/test/video_capture_unittest.cc index 81380f438c..2b8786b0fe 100644 --- a/webrtc/modules/video_capture/test/video_capture_unittest.cc +++ b/webrtc/modules/video_capture/test/video_capture_unittest.cc @@ -20,9 +20,9 @@ #include "webrtc/modules/utility/interface/process_thread.h" #include "webrtc/modules/video_capture/include/video_capture.h" #include "webrtc/modules/video_capture/include/video_capture_factory.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/sleep.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/sleep.h" +#include "webrtc/system_wrappers/include/tick_util.h" #include "webrtc/test/testsupport/gtest_disable.h" #include "webrtc/video_frame.h" diff --git a/webrtc/modules/video_capture/video_capture_impl.cc b/webrtc/modules/video_capture/video_capture_impl.cc index bdd15b1343..4046181505 100644 --- a/webrtc/modules/video_capture/video_capture_impl.cc +++ b/webrtc/modules/video_capture/video_capture_impl.cc @@ -16,11 +16,11 @@ #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/modules/video_capture/video_capture_config.h" -#include "webrtc/system_wrappers/interface/clock.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/logging.h" -#include "webrtc/system_wrappers/interface/ref_count.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/clock.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/logging.h" +#include "webrtc/system_wrappers/include/ref_count.h" +#include "webrtc/system_wrappers/include/tick_util.h" namespace webrtc { diff --git a/webrtc/modules/video_capture/video_capture_impl.h b/webrtc/modules/video_capture/video_capture_impl.h index a19b4680b7..deb989c251 100644 --- a/webrtc/modules/video_capture/video_capture_impl.h +++ b/webrtc/modules/video_capture/video_capture_impl.h @@ -19,7 +19,7 @@ #include "webrtc/common_video/rotation.h" #include "webrtc/modules/video_capture/include/video_capture.h" #include "webrtc/modules/video_capture/video_capture_config.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/tick_util.h" #include "webrtc/video_frame.h" namespace webrtc diff --git a/webrtc/modules/video_capture/windows/device_info_ds.cc b/webrtc/modules/video_capture/windows/device_info_ds.cc index c4ed9bb4a9..066a741839 100644 --- a/webrtc/modules/video_capture/windows/device_info_ds.cc +++ b/webrtc/modules/video_capture/windows/device_info_ds.cc @@ -13,8 +13,8 @@ #include "webrtc/modules/video_capture/video_capture_config.h" #include "webrtc/modules/video_capture/video_capture_delay.h" #include "webrtc/modules/video_capture/windows/help_functions_ds.h" -#include "webrtc/system_wrappers/interface/ref_count.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/ref_count.h" +#include "webrtc/system_wrappers/include/trace.h" #include #include diff --git a/webrtc/modules/video_capture/windows/sink_filter_ds.cc b/webrtc/modules/video_capture/windows/sink_filter_ds.cc index 1669d0384d..ba0f605e69 100644 --- a/webrtc/modules/video_capture/windows/sink_filter_ds.cc +++ b/webrtc/modules/video_capture/windows/sink_filter_ds.cc @@ -12,7 +12,7 @@ #include "webrtc/base/platform_thread.h" #include "webrtc/modules/video_capture/windows/help_functions_ds.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" #include // VIDEOINFOHEADER2 #include diff --git a/webrtc/modules/video_capture/windows/video_capture_ds.cc b/webrtc/modules/video_capture/windows/video_capture_ds.cc index 2d660558d9..b69e50121d 100644 --- a/webrtc/modules/video_capture/windows/video_capture_ds.cc +++ b/webrtc/modules/video_capture/windows/video_capture_ds.cc @@ -13,8 +13,8 @@ #include "webrtc/modules/video_capture/video_capture_config.h" #include "webrtc/modules/video_capture/windows/help_functions_ds.h" #include "webrtc/modules/video_capture/windows/sink_filter_ds.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" #include // VIDEOINFOHEADER2 diff --git a/webrtc/modules/video_capture/windows/video_capture_factory_windows.cc b/webrtc/modules/video_capture/windows/video_capture_factory_windows.cc index 89c0297c8f..747d3d60cf 100644 --- a/webrtc/modules/video_capture/windows/video_capture_factory_windows.cc +++ b/webrtc/modules/video_capture/windows/video_capture_factory_windows.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/video_capture/windows/video_capture_ds.h" #include "webrtc/modules/video_capture/windows/video_capture_mf.h" -#include "webrtc/system_wrappers/interface/ref_count.h" +#include "webrtc/system_wrappers/include/ref_count.h" namespace webrtc { namespace videocapturemodule { diff --git a/webrtc/modules/video_coding/codecs/test/packet_manipulator.h b/webrtc/modules/video_coding/codecs/test/packet_manipulator.h index 5a1654a2a7..16a9dc22ef 100644 --- a/webrtc/modules/video_coding/codecs/test/packet_manipulator.h +++ b/webrtc/modules/video_coding/codecs/test/packet_manipulator.h @@ -14,7 +14,7 @@ #include #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/test/testsupport/packet_reader.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor.cc b/webrtc/modules/video_coding/codecs/test/videoprocessor.cc index 7844891c3d..c814dfe0e7 100644 --- a/webrtc/modules/video_coding/codecs/test/videoprocessor.cc +++ b/webrtc/modules/video_coding/codecs/test/videoprocessor.cc @@ -16,7 +16,7 @@ #include #include -#include "webrtc/system_wrappers/interface/cpu_info.h" +#include "webrtc/system_wrappers/include/cpu_info.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor.h b/webrtc/modules/video_coding/codecs/test/videoprocessor.h index 4b6aed1d5b..0b094ae73e 100644 --- a/webrtc/modules/video_coding/codecs/test/videoprocessor.h +++ b/webrtc/modules/video_coding/codecs/test/videoprocessor.h @@ -18,7 +18,7 @@ #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" #include "webrtc/modules/video_coding/codecs/test/packet_manipulator.h" #include "webrtc/modules/video_coding/codecs/test/stats.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/tick_util.h" #include "webrtc/test/testsupport/frame_reader.h" #include "webrtc/test/testsupport/frame_writer.h" #include "webrtc/video_frame.h" diff --git a/webrtc/modules/video_coding/codecs/tools/video_quality_measurement.cc b/webrtc/modules/video_coding/codecs/tools/video_quality_measurement.cc index bfcb2e60e1..22be5a83cc 100644 --- a/webrtc/modules/video_coding/codecs/tools/video_quality_measurement.cc +++ b/webrtc/modules/video_coding/codecs/tools/video_quality_measurement.cc @@ -27,7 +27,7 @@ #include "webrtc/modules/video_coding/codecs/test/videoprocessor.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" #include "webrtc/modules/video_coding/main/interface/video_coding.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/testsupport/frame_reader.h" #include "webrtc/test/testsupport/frame_writer.h" #include "webrtc/test/testsupport/metrics/video_metrics.h" diff --git a/webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc b/webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc index 50a86b6a4d..5ec674f16a 100644 --- a/webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc +++ b/webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc @@ -14,7 +14,7 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/tick_util.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/gtest_disable.h" diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc index 3c7cc4ddd3..029ccd1f27 100644 --- a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc +++ b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc @@ -29,7 +29,7 @@ #include "webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h" #include "webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h" #include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/tick_util.h" namespace webrtc { namespace { diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8_sequence_coder.cc b/webrtc/modules/video_coding/codecs/vp8/vp8_sequence_coder.cc index a8b5d8f665..5843d83fa7 100644 --- a/webrtc/modules/video_coding/codecs/vp8/vp8_sequence_coder.cc +++ b/webrtc/modules/video_coding/codecs/vp8/vp8_sequence_coder.cc @@ -13,7 +13,7 @@ #include "webrtc/common_video/interface/video_image.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/tick_util.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/metrics/video_metrics.h" #include "webrtc/tools/simple_command_line_parser.h" diff --git a/webrtc/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc b/webrtc/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc index 239ced8f90..bedbe68ca8 100644 --- a/webrtc/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc +++ b/webrtc/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc @@ -16,7 +16,7 @@ #include "vpx/vpx_frame_buffer.h" #include "webrtc/base/checks.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc b/webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc index 59574aeda9..0ca7eeabe9 100644 --- a/webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc +++ b/webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc @@ -27,8 +27,8 @@ #include "webrtc/common.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/interface/module_common_types.h" -#include "webrtc/system_wrappers/interface/logging.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/logging.h" +#include "webrtc/system_wrappers/include/tick_util.h" namespace { diff --git a/webrtc/modules/video_coding/main/interface/video_coding.h b/webrtc/modules/video_coding/main/interface/video_coding.h index 889be69303..d2dd05057a 100644 --- a/webrtc/modules/video_coding/main/interface/video_coding.h +++ b/webrtc/modules/video_coding/main/interface/video_coding.h @@ -24,7 +24,7 @@ #include "webrtc/modules/interface/module.h" #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/video_frame.h" namespace webrtc diff --git a/webrtc/modules/video_coding/main/source/codec_database.cc b/webrtc/modules/video_coding/main/source/codec_database.cc index 4c5227a388..349791d83b 100644 --- a/webrtc/modules/video_coding/main/source/codec_database.cc +++ b/webrtc/modules/video_coding/main/source/codec_database.cc @@ -27,7 +27,7 @@ #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" #endif #include "webrtc/modules/video_coding/main/source/internal_defines.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" namespace { const size_t kDefaultPayloadSize = 1440; diff --git a/webrtc/modules/video_coding/main/source/frame_buffer.cc b/webrtc/modules/video_coding/main/source/frame_buffer.cc index 3e4e762b2c..5b6680ec61 100644 --- a/webrtc/modules/video_coding/main/source/frame_buffer.cc +++ b/webrtc/modules/video_coding/main/source/frame_buffer.cc @@ -15,7 +15,7 @@ #include "webrtc/base/checks.h" #include "webrtc/modules/video_coding/main/source/packet.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/generic_decoder.cc b/webrtc/modules/video_coding/main/source/generic_decoder.cc index f874e163c8..8b2d3974de 100644 --- a/webrtc/modules/video_coding/main/source/generic_decoder.cc +++ b/webrtc/modules/video_coding/main/source/generic_decoder.cc @@ -11,8 +11,8 @@ #include "webrtc/modules/video_coding/main/interface/video_coding.h" #include "webrtc/modules/video_coding/main/source/generic_decoder.h" #include "webrtc/modules/video_coding/main/source/internal_defines.h" -#include "webrtc/system_wrappers/interface/clock.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/clock.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/generic_encoder.cc b/webrtc/modules/video_coding/main/source/generic_encoder.cc index fe3d5cb991..dbb1c17ff9 100644 --- a/webrtc/modules/video_coding/main/source/generic_encoder.cc +++ b/webrtc/modules/video_coding/main/source/generic_encoder.cc @@ -13,8 +13,8 @@ #include "webrtc/modules/video_coding/main/source/encoded_frame.h" #include "webrtc/modules/video_coding/main/source/generic_encoder.h" #include "webrtc/modules/video_coding/main/source/media_optimization.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { namespace { diff --git a/webrtc/modules/video_coding/main/source/jitter_buffer.cc b/webrtc/modules/video_coding/main/source/jitter_buffer.cc index 96c024594f..bfdd7867d9 100644 --- a/webrtc/modules/video_coding/main/source/jitter_buffer.cc +++ b/webrtc/modules/video_coding/main/source/jitter_buffer.cc @@ -24,11 +24,11 @@ #include "webrtc/modules/video_coding/main/source/jitter_buffer_common.h" #include "webrtc/modules/video_coding/main/source/jitter_estimator.h" #include "webrtc/modules/video_coding/main/source/packet.h" -#include "webrtc/system_wrappers/interface/clock.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/logging.h" -#include "webrtc/system_wrappers/interface/metrics.h" +#include "webrtc/system_wrappers/include/clock.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/logging.h" +#include "webrtc/system_wrappers/include/metrics.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/jitter_buffer.h b/webrtc/modules/video_coding/main/source/jitter_buffer.h index 31e3be2578..f4a3638f7d 100644 --- a/webrtc/modules/video_coding/main/source/jitter_buffer.h +++ b/webrtc/modules/video_coding/main/source/jitter_buffer.h @@ -25,7 +25,7 @@ #include "webrtc/modules/video_coding/main/source/inter_frame_delay.h" #include "webrtc/modules/video_coding/main/source/jitter_buffer_common.h" #include "webrtc/modules/video_coding/main/source/jitter_estimator.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/jitter_buffer_unittest.cc b/webrtc/modules/video_coding/main/source/jitter_buffer_unittest.cc index 06946a428e..d6c6d4985b 100644 --- a/webrtc/modules/video_coding/main/source/jitter_buffer_unittest.cc +++ b/webrtc/modules/video_coding/main/source/jitter_buffer_unittest.cc @@ -19,8 +19,8 @@ #include "webrtc/modules/video_coding/main/source/packet.h" #include "webrtc/modules/video_coding/main/source/test/stream_generator.h" #include "webrtc/modules/video_coding/main/test/test_util.h" -#include "webrtc/system_wrappers/interface/clock.h" -#include "webrtc/system_wrappers/interface/metrics.h" +#include "webrtc/system_wrappers/include/clock.h" +#include "webrtc/system_wrappers/include/metrics.h" #include "webrtc/test/histogram.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/jitter_estimator.cc b/webrtc/modules/video_coding/main/source/jitter_estimator.cc index 9024443006..5894c88d72 100644 --- a/webrtc/modules/video_coding/main/source/jitter_estimator.cc +++ b/webrtc/modules/video_coding/main/source/jitter_estimator.cc @@ -11,8 +11,8 @@ #include "webrtc/modules/video_coding/main/source/internal_defines.h" #include "webrtc/modules/video_coding/main/source/jitter_estimator.h" #include "webrtc/modules/video_coding/main/source/rtt_filter.h" -#include "webrtc/system_wrappers/interface/clock.h" -#include "webrtc/system_wrappers/interface/field_trial.h" +#include "webrtc/system_wrappers/include/clock.h" +#include "webrtc/system_wrappers/include/field_trial.h" #include #include diff --git a/webrtc/modules/video_coding/main/source/jitter_estimator_tests.cc b/webrtc/modules/video_coding/main/source/jitter_estimator_tests.cc index 5f34750572..c69c4bcdad 100644 --- a/webrtc/modules/video_coding/main/source/jitter_estimator_tests.cc +++ b/webrtc/modules/video_coding/main/source/jitter_estimator_tests.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/video_coding/main/source/jitter_estimator.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/media_opt_util.h b/webrtc/modules/video_coding/main/source/media_opt_util.h index 62d067ab3a..2085bbcde9 100644 --- a/webrtc/modules/video_coding/main/source/media_opt_util.h +++ b/webrtc/modules/video_coding/main/source/media_opt_util.h @@ -18,7 +18,7 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/modules/video_coding/main/source/internal_defines.h" #include "webrtc/modules/video_coding/main/source/qm_select.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/media_optimization.cc b/webrtc/modules/video_coding/main/source/media_optimization.cc index 327c8b4b57..e69dfb133d 100644 --- a/webrtc/modules/video_coding/main/source/media_optimization.cc +++ b/webrtc/modules/video_coding/main/source/media_optimization.cc @@ -13,8 +13,8 @@ #include "webrtc/modules/video_coding/main/source/content_metrics_processing.h" #include "webrtc/modules/video_coding/main/source/qm_select.h" #include "webrtc/modules/video_coding/utility/include/frame_dropper.h" -#include "webrtc/system_wrappers/interface/clock.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/clock.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { namespace media_optimization { diff --git a/webrtc/modules/video_coding/main/source/media_optimization.h b/webrtc/modules/video_coding/main/source/media_optimization.h index d2c07c9794..8d33980e5d 100644 --- a/webrtc/modules/video_coding/main/source/media_optimization.h +++ b/webrtc/modules/video_coding/main/source/media_optimization.h @@ -18,7 +18,7 @@ #include "webrtc/modules/video_coding/main/interface/video_coding.h" #include "webrtc/modules/video_coding/main/source/media_opt_util.h" #include "webrtc/modules/video_coding/main/source/qm_select.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/media_optimization_unittest.cc b/webrtc/modules/video_coding/main/source/media_optimization_unittest.cc index dadc3247cd..c894d72203 100644 --- a/webrtc/modules/video_coding/main/source/media_optimization_unittest.cc +++ b/webrtc/modules/video_coding/main/source/media_optimization_unittest.cc @@ -10,7 +10,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/video_coding/main/source/media_optimization.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" namespace webrtc { namespace media_optimization { diff --git a/webrtc/modules/video_coding/main/source/qm_select.cc b/webrtc/modules/video_coding/main/source/qm_select.cc index 3007f63445..e86d0755c0 100644 --- a/webrtc/modules/video_coding/main/source/qm_select.cc +++ b/webrtc/modules/video_coding/main/source/qm_select.cc @@ -16,7 +16,7 @@ #include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" #include "webrtc/modules/video_coding/main/source/internal_defines.h" #include "webrtc/modules/video_coding/main/source/qm_select_data.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/receiver.cc b/webrtc/modules/video_coding/main/source/receiver.cc index 6a98cb150a..0707a9c3cd 100644 --- a/webrtc/modules/video_coding/main/source/receiver.cc +++ b/webrtc/modules/video_coding/main/source/receiver.cc @@ -18,8 +18,8 @@ #include "webrtc/modules/video_coding/main/source/encoded_frame.h" #include "webrtc/modules/video_coding/main/source/internal_defines.h" #include "webrtc/modules/video_coding/main/source/media_opt_util.h" -#include "webrtc/system_wrappers/interface/clock.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/clock.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/receiver.h b/webrtc/modules/video_coding/main/source/receiver.h index ce8320dcbf..e2515d438f 100644 --- a/webrtc/modules/video_coding/main/source/receiver.h +++ b/webrtc/modules/video_coding/main/source/receiver.h @@ -14,7 +14,7 @@ #include "webrtc/modules/video_coding/main/source/jitter_buffer.h" #include "webrtc/modules/video_coding/main/source/packet.h" #include "webrtc/modules/video_coding/main/source/timing.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/modules/video_coding/main/interface/video_coding.h" #include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" diff --git a/webrtc/modules/video_coding/main/source/receiver_unittest.cc b/webrtc/modules/video_coding/main/source/receiver_unittest.cc index 707e1f1d79..359b241e72 100644 --- a/webrtc/modules/video_coding/main/source/receiver_unittest.cc +++ b/webrtc/modules/video_coding/main/source/receiver_unittest.cc @@ -19,8 +19,8 @@ #include "webrtc/modules/video_coding/main/source/test/stream_generator.h" #include "webrtc/modules/video_coding/main/source/timing.h" #include "webrtc/modules/video_coding/main/test/test_util.h" -#include "webrtc/system_wrappers/interface/clock.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/clock.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/session_info.cc b/webrtc/modules/video_coding/main/source/session_info.cc index 88fe69c5b1..9a1bc54e52 100644 --- a/webrtc/modules/video_coding/main/source/session_info.cc +++ b/webrtc/modules/video_coding/main/source/session_info.cc @@ -11,7 +11,7 @@ #include "webrtc/modules/video_coding/main/source/session_info.h" #include "webrtc/modules/video_coding/main/source/packet.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/test/stream_generator.cc b/webrtc/modules/video_coding/main/source/test/stream_generator.cc index 664764a36a..b365d96dc0 100644 --- a/webrtc/modules/video_coding/main/source/test/stream_generator.cc +++ b/webrtc/modules/video_coding/main/source/test/stream_generator.cc @@ -17,7 +17,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/video_coding/main/source/packet.h" #include "webrtc/modules/video_coding/main/test/test_util.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/timing.cc b/webrtc/modules/video_coding/main/source/timing.cc index 0e2fddf089..8d59135876 100644 --- a/webrtc/modules/video_coding/main/source/timing.cc +++ b/webrtc/modules/video_coding/main/source/timing.cc @@ -12,9 +12,9 @@ #include "webrtc/modules/video_coding/main/source/internal_defines.h" #include "webrtc/modules/video_coding/main/source/jitter_buffer_common.h" -#include "webrtc/system_wrappers/interface/clock.h" -#include "webrtc/system_wrappers/interface/metrics.h" -#include "webrtc/system_wrappers/interface/timestamp_extrapolator.h" +#include "webrtc/system_wrappers/include/clock.h" +#include "webrtc/system_wrappers/include/metrics.h" +#include "webrtc/system_wrappers/include/timestamp_extrapolator.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/timing.h b/webrtc/modules/video_coding/main/source/timing.h index 61c0273010..d3b8fa673f 100644 --- a/webrtc/modules/video_coding/main/source/timing.h +++ b/webrtc/modules/video_coding/main/source/timing.h @@ -13,7 +13,7 @@ #include "webrtc/base/thread_annotations.h" #include "webrtc/modules/video_coding/main/source/codec_timer.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/timing_unittest.cc b/webrtc/modules/video_coding/main/source/timing_unittest.cc index 0fa18d30ce..694a600c2a 100644 --- a/webrtc/modules/video_coding/main/source/timing_unittest.cc +++ b/webrtc/modules/video_coding/main/source/timing_unittest.cc @@ -18,8 +18,8 @@ #include "webrtc/modules/video_coding/main/source/internal_defines.h" #include "webrtc/modules/video_coding/main/source/timing.h" #include "webrtc/modules/video_coding/main/test/test_util.h" -#include "webrtc/system_wrappers/interface/clock.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/clock.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/testsupport/fileutils.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/video_coding_impl.cc b/webrtc/modules/video_coding/main/source/video_coding_impl.cc index e06484ec30..cae00423c0 100644 --- a/webrtc/modules/video_coding/main/source/video_coding_impl.cc +++ b/webrtc/modules/video_coding/main/source/video_coding_impl.cc @@ -15,7 +15,7 @@ #include "webrtc/modules/video_coding/main/source/jitter_buffer.h" #include "webrtc/modules/video_coding/main/source/packet.h" #include "webrtc/modules/video_coding/main/source/video_coding_impl.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" namespace webrtc { namespace vcm { diff --git a/webrtc/modules/video_coding/main/source/video_coding_impl.h b/webrtc/modules/video_coding/main/source/video_coding_impl.h index 2d9dc06025..34900273de 100644 --- a/webrtc/modules/video_coding/main/source/video_coding_impl.h +++ b/webrtc/modules/video_coding/main/source/video_coding_impl.h @@ -26,8 +26,8 @@ #include "webrtc/modules/video_coding/main/source/receiver.h" #include "webrtc/modules/video_coding/main/source/timing.h" #include "webrtc/modules/video_coding/utility/include/qp_parser.h" -#include "webrtc/system_wrappers/interface/clock.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/clock.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/video_coding_robustness_unittest.cc b/webrtc/modules/video_coding/main/source/video_coding_robustness_unittest.cc index 2476b989b0..ac6e16bd80 100644 --- a/webrtc/modules/video_coding/main/source/video_coding_robustness_unittest.cc +++ b/webrtc/modules/video_coding/main/source/video_coding_robustness_unittest.cc @@ -14,7 +14,7 @@ #include "webrtc/modules/video_coding/main/interface/mock/mock_vcm_callbacks.h" #include "webrtc/modules/video_coding/main/interface/video_coding.h" #include "webrtc/modules/video_coding/main/test/test_util.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/main/source/video_receiver.cc b/webrtc/modules/video_coding/main/source/video_receiver.cc index 2e23b5ef69..cf0a490da9 100644 --- a/webrtc/modules/video_coding/main/source/video_receiver.cc +++ b/webrtc/modules/video_coding/main/source/video_receiver.cc @@ -17,8 +17,8 @@ #include "webrtc/modules/video_coding/main/source/jitter_buffer.h" #include "webrtc/modules/video_coding/main/source/packet.h" #include "webrtc/modules/video_coding/main/source/video_coding_impl.h" -#include "webrtc/system_wrappers/interface/clock.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/clock.h" +#include "webrtc/system_wrappers/include/logging.h" // #define DEBUG_DECODER_BIT_STREAM diff --git a/webrtc/modules/video_coding/main/source/video_receiver_unittest.cc b/webrtc/modules/video_coding/main/source/video_receiver_unittest.cc index 16eaed344d..75ea29a1ec 100644 --- a/webrtc/modules/video_coding/main/source/video_receiver_unittest.cc +++ b/webrtc/modules/video_coding/main/source/video_receiver_unittest.cc @@ -17,7 +17,7 @@ #include "webrtc/modules/video_coding/main/interface/video_coding.h" #include "webrtc/modules/video_coding/main/source/video_coding_impl.h" #include "webrtc/modules/video_coding/main/test/test_util.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" using ::testing::_; using ::testing::NiceMock; diff --git a/webrtc/modules/video_coding/main/source/video_sender.cc b/webrtc/modules/video_coding/main/source/video_sender.cc index 8401cb2ac0..cdbaffd75f 100644 --- a/webrtc/modules/video_coding/main/source/video_sender.cc +++ b/webrtc/modules/video_coding/main/source/video_sender.cc @@ -18,8 +18,8 @@ #include "webrtc/modules/video_coding/main/source/encoded_frame.h" #include "webrtc/modules/video_coding/main/source/video_coding_impl.h" #include "webrtc/modules/video_coding/utility/include/quality_scaler.h" -#include "webrtc/system_wrappers/interface/clock.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/clock.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { namespace vcm { diff --git a/webrtc/modules/video_coding/main/source/video_sender_unittest.cc b/webrtc/modules/video_coding/main/source/video_sender_unittest.cc index a4b40babc6..b1d645d12d 100644 --- a/webrtc/modules/video_coding/main/source/video_sender_unittest.cc +++ b/webrtc/modules/video_coding/main/source/video_sender_unittest.cc @@ -21,7 +21,7 @@ #include "webrtc/modules/video_coding/main/interface/video_coding.h" #include "webrtc/modules/video_coding/main/source/video_coding_impl.h" #include "webrtc/modules/video_coding/main/test/test_util.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" #include "webrtc/test/frame_generator.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/gtest_disable.h" diff --git a/webrtc/modules/video_coding/main/test/rtp_player.cc b/webrtc/modules/video_coding/main/test/rtp_player.cc index 74a5b95877..6717cf227d 100644 --- a/webrtc/modules/video_coding/main/test/rtp_player.cc +++ b/webrtc/modules/video_coding/main/test/rtp_player.cc @@ -21,8 +21,8 @@ #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h" #include "webrtc/modules/video_coding/main/source/internal_defines.h" #include "webrtc/modules/video_coding/main/test/test_util.h" -#include "webrtc/system_wrappers/interface/clock.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/clock.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/test/rtp_file_reader.h" #if 1 diff --git a/webrtc/modules/video_coding/main/test/test_util.h b/webrtc/modules/video_coding/main/test/test_util.h index 55cf4b91af..27f66fe011 100644 --- a/webrtc/modules/video_coding/main/test/test_util.h +++ b/webrtc/modules/video_coding/main/test/test_util.h @@ -20,7 +20,7 @@ #include "webrtc/base/constructormagic.h" #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/modules/video_coding/main/interface/video_coding.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" enum { kMaxNackListSize = 250 }; enum { kMaxPacketAgeToNack = 450 }; diff --git a/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.cc b/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.cc index 6a6362b9d3..2d874cd1bd 100644 --- a/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.cc +++ b/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.cc @@ -16,8 +16,8 @@ #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h" #include "webrtc/modules/video_coding/main/test/test_util.h" -#include "webrtc/system_wrappers/interface/clock.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/clock.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" namespace webrtc { namespace rtpplayer { diff --git a/webrtc/modules/video_coding/main/test/video_rtp_play.cc b/webrtc/modules/video_coding/main/test/video_rtp_play.cc index 256f508327..8460601bf5 100644 --- a/webrtc/modules/video_coding/main/test/video_rtp_play.cc +++ b/webrtc/modules/video_coding/main/test/video_rtp_play.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/video_coding/main/test/receiver_tests.h" #include "webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/testsupport/fileutils.h" namespace { diff --git a/webrtc/modules/video_coding/utility/frame_dropper.cc b/webrtc/modules/video_coding/utility/frame_dropper.cc index a684af7a39..5262c5b88a 100644 --- a/webrtc/modules/video_coding/utility/frame_dropper.cc +++ b/webrtc/modules/video_coding/utility/frame_dropper.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/video_coding/utility/include/frame_dropper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/utility/vp8_header_parser.cc b/webrtc/modules/video_coding/utility/vp8_header_parser.cc index 9fcd6e4f0c..dc5a0e5d15 100644 --- a/webrtc/modules/video_coding/utility/vp8_header_parser.cc +++ b/webrtc/modules/video_coding/utility/vp8_header_parser.cc @@ -12,7 +12,7 @@ #include "webrtc/modules/video_coding/utility/include/vp8_header_parser.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { diff --git a/webrtc/modules/video_processing/main/source/content_analysis.cc b/webrtc/modules/video_processing/main/source/content_analysis.cc index 951357f7f4..d29db27408 100644 --- a/webrtc/modules/video_processing/main/source/content_analysis.cc +++ b/webrtc/modules/video_processing/main/source/content_analysis.cc @@ -12,8 +12,8 @@ #include #include -#include "webrtc/system_wrappers/interface/cpu_features_wrapper.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" +#include "webrtc/system_wrappers/include/tick_util.h" namespace webrtc { diff --git a/webrtc/modules/video_processing/main/source/deflickering.cc b/webrtc/modules/video_processing/main/source/deflickering.cc index e06b12eca6..19bc641ac9 100644 --- a/webrtc/modules/video_processing/main/source/deflickering.cc +++ b/webrtc/modules/video_processing/main/source/deflickering.cc @@ -14,8 +14,8 @@ #include #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" -#include "webrtc/system_wrappers/interface/logging.h" -#include "webrtc/system_wrappers/interface/sort.h" +#include "webrtc/system_wrappers/include/logging.h" +#include "webrtc/system_wrappers/include/sort.h" namespace webrtc { diff --git a/webrtc/modules/video_processing/main/source/video_decimator.cc b/webrtc/modules/video_processing/main/source/video_decimator.cc index 9991c4fda7..34c29c1677 100644 --- a/webrtc/modules/video_processing/main/source/video_decimator.cc +++ b/webrtc/modules/video_processing/main/source/video_decimator.cc @@ -11,7 +11,7 @@ #include "webrtc/base/checks.h" #include "webrtc/modules/video_processing/main/interface/video_processing.h" #include "webrtc/modules/video_processing/main/source/video_decimator.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/tick_util.h" #define VD_MIN(a, b) ((a) < (b)) ? (a) : (b) diff --git a/webrtc/modules/video_processing/main/source/video_processing_impl.cc b/webrtc/modules/video_processing/main/source/video_processing_impl.cc index c04c566311..eaaf14f6ad 100644 --- a/webrtc/modules/video_processing/main/source/video_processing_impl.cc +++ b/webrtc/modules/video_processing/main/source/video_processing_impl.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/video_processing/main/source/video_processing_impl.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/logging.h" #include diff --git a/webrtc/modules/video_processing/main/test/unit_test/deflickering_test.cc b/webrtc/modules/video_processing/main/test/unit_test/deflickering_test.cc index f270813078..83d09ef486 100644 --- a/webrtc/modules/video_processing/main/test/unit_test/deflickering_test.cc +++ b/webrtc/modules/video_processing/main/test/unit_test/deflickering_test.cc @@ -14,7 +14,7 @@ #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/video_processing/main/interface/video_processing.h" #include "webrtc/modules/video_processing/main/test/unit_test/video_processing_unittest.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/tick_util.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/gtest_disable.h" diff --git a/webrtc/modules/video_processing/main/test/unit_test/video_processing_unittest.cc b/webrtc/modules/video_processing/main/test/unit_test/video_processing_unittest.cc index 99984fa002..11ccc4891b 100644 --- a/webrtc/modules/video_processing/main/test/unit_test/video_processing_unittest.cc +++ b/webrtc/modules/video_processing/main/test/unit_test/video_processing_unittest.cc @@ -14,7 +14,7 @@ #include #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/tick_util.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/gtest_disable.h" diff --git a/webrtc/modules/video_processing/main/test/unit_test/video_processing_unittest.h b/webrtc/modules/video_processing/main/test/unit_test/video_processing_unittest.h index 01a5161c33..4a4fda41e6 100644 --- a/webrtc/modules/video_processing/main/test/unit_test/video_processing_unittest.h +++ b/webrtc/modules/video_processing/main/test/unit_test/video_processing_unittest.h @@ -13,7 +13,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/video_processing/main/interface/video_processing.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/testsupport/fileutils.h" namespace webrtc { diff --git a/webrtc/modules/video_render/android/video_render_android_impl.cc b/webrtc/modules/video_render/android/video_render_android_impl.cc index 15b52d7739..c647501963 100644 --- a/webrtc/modules/video_render/android/video_render_android_impl.cc +++ b/webrtc/modules/video_render/android/video_render_android_impl.cc @@ -11,9 +11,9 @@ #include "webrtc/modules/video_render/android/video_render_android_impl.h" #include "webrtc/modules/video_render/video_render_internal.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/tick_util.h" #ifdef ANDROID #include @@ -22,7 +22,7 @@ #undef WEBRTC_TRACE #define WEBRTC_TRACE(a,b,c,...) __android_log_print(ANDROID_LOG_DEBUG, "*WEBRTCN*", __VA_ARGS__) #else -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" #endif namespace webrtc { diff --git a/webrtc/modules/video_render/android/video_render_android_impl.h b/webrtc/modules/video_render/android/video_render_android_impl.h index fb32acf08a..34950db7d1 100644 --- a/webrtc/modules/video_render/android/video_render_android_impl.h +++ b/webrtc/modules/video_render/android/video_render_android_impl.h @@ -16,7 +16,7 @@ #include #include "webrtc/modules/video_render/i_video_render.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/video_render/android/video_render_android_native_opengl2.cc b/webrtc/modules/video_render/android/video_render_android_native_opengl2.cc index b5d1a43496..286776e317 100644 --- a/webrtc/modules/video_render/android/video_render_android_native_opengl2.cc +++ b/webrtc/modules/video_render/android/video_render_android_native_opengl2.cc @@ -9,8 +9,8 @@ */ #include "webrtc/modules/video_render/android/video_render_android_native_opengl2.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/tick_util.h" #ifdef ANDROID_LOG #include @@ -19,7 +19,7 @@ #undef WEBRTC_TRACE #define WEBRTC_TRACE(a,b,c,...) __android_log_print(ANDROID_LOG_DEBUG, "*WEBRTC*", __VA_ARGS__) #else -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" #endif namespace webrtc { diff --git a/webrtc/modules/video_render/android/video_render_android_surface_view.cc b/webrtc/modules/video_render/android/video_render_android_surface_view.cc index d05e460fe0..ea3b106b1e 100644 --- a/webrtc/modules/video_render/android/video_render_android_surface_view.cc +++ b/webrtc/modules/video_render/android/video_render_android_surface_view.cc @@ -10,8 +10,8 @@ #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/video_render/android/video_render_android_surface_view.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/tick_util.h" #ifdef ANDROID_LOG #include @@ -20,7 +20,7 @@ #undef WEBRTC_TRACE #define WEBRTC_TRACE(a,b,c,...) __android_log_print(ANDROID_LOG_DEBUG, "*WEBRTC*", __VA_ARGS__) #else -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" #endif namespace webrtc { diff --git a/webrtc/modules/video_render/android/video_render_opengles20.cc b/webrtc/modules/video_render/android/video_render_opengles20.cc index 1ce89434e8..45db56a4f6 100644 --- a/webrtc/modules/video_render/android/video_render_opengles20.cc +++ b/webrtc/modules/video_render/android/video_render_opengles20.cc @@ -25,7 +25,7 @@ #undef WEBRTC_TRACE #define WEBRTC_TRACE(a,b,c,...) __android_log_print(ANDROID_LOG_DEBUG, "*WEBRTCN*", __VA_ARGS__) #else -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" #endif namespace webrtc { diff --git a/webrtc/modules/video_render/external/video_render_external_impl.h b/webrtc/modules/video_render/external/video_render_external_impl.h index ddd762abb5..9230e60acc 100644 --- a/webrtc/modules/video_render/external/video_render_external_impl.h +++ b/webrtc/modules/video_render/external/video_render_external_impl.h @@ -13,7 +13,7 @@ #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/modules/video_render/i_video_render.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/video_render/ios/open_gles20.mm b/webrtc/modules/video_render/ios/open_gles20.mm index 633ce4e311..d1735280f2 100644 --- a/webrtc/modules/video_render/ios/open_gles20.mm +++ b/webrtc/modules/video_render/ios/open_gles20.mm @@ -17,7 +17,7 @@ // TODO(sjlee): unify this copy with the android one. #include "webrtc/modules/video_render/ios/open_gles20.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" using namespace webrtc; diff --git a/webrtc/modules/video_render/ios/video_render_ios_gles20.h b/webrtc/modules/video_render/ios/video_render_ios_gles20.h index 428d904e6d..b6da12aab8 100644 --- a/webrtc/modules/video_render/ios/video_render_ios_gles20.h +++ b/webrtc/modules/video_render/ios/video_render_ios_gles20.h @@ -17,7 +17,7 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/modules/video_render/ios/video_render_ios_channel.h" #include "webrtc/modules/video_render/ios/video_render_ios_view.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/video_render/ios/video_render_ios_gles20.mm b/webrtc/modules/video_render/ios/video_render_ios_gles20.mm index 92b0409ba7..3a276d6030 100644 --- a/webrtc/modules/video_render/ios/video_render_ios_gles20.mm +++ b/webrtc/modules/video_render/ios/video_render_ios_gles20.mm @@ -13,8 +13,8 @@ #endif #include "webrtc/modules/video_render/ios/video_render_ios_gles20.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" using namespace webrtc; diff --git a/webrtc/modules/video_render/ios/video_render_ios_impl.mm b/webrtc/modules/video_render/ios/video_render_ios_impl.mm index 49bae089a7..0ef411d56f 100644 --- a/webrtc/modules/video_render/ios/video_render_ios_impl.mm +++ b/webrtc/modules/video_render/ios/video_render_ios_impl.mm @@ -14,8 +14,8 @@ #include "webrtc/modules/video_render/ios/video_render_ios_impl.h" #include "webrtc/modules/video_render/ios/video_render_ios_gles20.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" using namespace webrtc; diff --git a/webrtc/modules/video_render/ios/video_render_ios_view.mm b/webrtc/modules/video_render/ios/video_render_ios_view.mm index ce4d833da0..6ffe976c99 100644 --- a/webrtc/modules/video_render/ios/video_render_ios_view.mm +++ b/webrtc/modules/video_render/ios/video_render_ios_view.mm @@ -13,7 +13,7 @@ #endif #include "webrtc/modules/video_render/ios/video_render_ios_view.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" using namespace webrtc; diff --git a/webrtc/modules/video_render/linux/video_render_linux_impl.cc b/webrtc/modules/video_render/linux/video_render_linux_impl.cc index af0e9acb9b..7e53dfdf80 100644 --- a/webrtc/modules/video_render/linux/video_render_linux_impl.cc +++ b/webrtc/modules/video_render/linux/video_render_linux_impl.cc @@ -11,8 +11,8 @@ #include "webrtc/modules/video_render/linux/video_render_linux_impl.h" #include "webrtc/modules/video_render/linux/video_x11_render.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" #include diff --git a/webrtc/modules/video_render/linux/video_x11_channel.cc b/webrtc/modules/video_render/linux/video_x11_channel.cc index 2a2e979f60..8d86b7c72a 100644 --- a/webrtc/modules/video_render/linux/video_x11_channel.cc +++ b/webrtc/modules/video_render/linux/video_x11_channel.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/video_render/linux/video_x11_channel.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { diff --git a/webrtc/modules/video_render/linux/video_x11_render.cc b/webrtc/modules/video_render/linux/video_x11_render.cc index 4bccb3ccc6..5eb4f36f95 100644 --- a/webrtc/modules/video_render/linux/video_x11_render.cc +++ b/webrtc/modules/video_render/linux/video_x11_render.cc @@ -11,8 +11,8 @@ #include "webrtc/modules/video_render/linux/video_x11_channel.h" #include "webrtc/modules/video_render/linux/video_x11_render.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { diff --git a/webrtc/modules/video_render/mac/cocoa_full_screen_window.mm b/webrtc/modules/video_render/mac/cocoa_full_screen_window.mm index 31f6b64031..b57223b4df 100644 --- a/webrtc/modules/video_render/mac/cocoa_full_screen_window.mm +++ b/webrtc/modules/video_render/mac/cocoa_full_screen_window.mm @@ -9,7 +9,7 @@ */ #include "webrtc/modules/video_render/mac/cocoa_full_screen_window.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" using namespace webrtc; diff --git a/webrtc/modules/video_render/mac/cocoa_render_view.mm b/webrtc/modules/video_render/mac/cocoa_render_view.mm index 86320bee1c..4631ff31a4 100644 --- a/webrtc/modules/video_render/mac/cocoa_render_view.mm +++ b/webrtc/modules/video_render/mac/cocoa_render_view.mm @@ -12,7 +12,7 @@ #import #include "webrtc/modules/video_render/mac/cocoa_render_view.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" using namespace webrtc; diff --git a/webrtc/modules/video_render/mac/video_render_agl.cc b/webrtc/modules/video_render/mac/video_render_agl.cc index f3f3429851..dc157d597b 100644 --- a/webrtc/modules/video_render/mac/video_render_agl.cc +++ b/webrtc/modules/video_render/mac/video_render_agl.cc @@ -16,9 +16,9 @@ // includes #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { diff --git a/webrtc/modules/video_render/mac/video_render_agl.h b/webrtc/modules/video_render/mac/video_render_agl.h index 4fd85eeba8..8710228754 100644 --- a/webrtc/modules/video_render/mac/video_render_agl.h +++ b/webrtc/modules/video_render/mac/video_render_agl.h @@ -16,7 +16,7 @@ #define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_MAC_VIDEO_RENDER_AGL_H_ #include "webrtc/modules/video_render/include/video_render_defines.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" #define NEW_HIVIEW_PARENT_EVENT_HANDLER 1 #define NEW_HIVIEW_EVENT_HANDLER 1 diff --git a/webrtc/modules/video_render/mac/video_render_mac_carbon_impl.cc b/webrtc/modules/video_render/mac/video_render_mac_carbon_impl.cc index dbb09a35f5..f85be5fb5e 100644 --- a/webrtc/modules/video_render/mac/video_render_mac_carbon_impl.cc +++ b/webrtc/modules/video_render/mac/video_render_mac_carbon_impl.cc @@ -14,8 +14,8 @@ #include #include "webrtc/modules/video_render/mac/video_render_agl.h" #include "webrtc/modules/video_render/mac/video_render_mac_carbon_impl.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { diff --git a/webrtc/modules/video_render/mac/video_render_mac_cocoa_impl.mm b/webrtc/modules/video_render/mac/video_render_mac_cocoa_impl.mm index 561d71fc37..5b017fecc0 100644 --- a/webrtc/modules/video_render/mac/video_render_mac_cocoa_impl.mm +++ b/webrtc/modules/video_render/mac/video_render_mac_cocoa_impl.mm @@ -14,8 +14,8 @@ #include "webrtc/modules/video_render/mac/cocoa_render_view.h" #include "webrtc/modules/video_render/mac/video_render_mac_cocoa_impl.h" #include "webrtc/modules/video_render/mac/video_render_nsopengl.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { diff --git a/webrtc/modules/video_render/mac/video_render_nsopengl.mm b/webrtc/modules/video_render/mac/video_render_nsopengl.mm index 24fa195b94..b5150eb668 100644 --- a/webrtc/modules/video_render/mac/video_render_nsopengl.mm +++ b/webrtc/modules/video_render/mac/video_render_nsopengl.mm @@ -13,10 +13,10 @@ #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/video_render/mac/video_render_nsopengl.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { diff --git a/webrtc/modules/video_render/test/testAPI/testAPI.cc b/webrtc/modules/video_render/test/testAPI/testAPI.cc index cd351bb12b..256d031c0c 100644 --- a/webrtc/modules/video_render/test/testAPI/testAPI.cc +++ b/webrtc/modules/video_render/test/testAPI/testAPI.cc @@ -36,9 +36,9 @@ #include "webrtc/modules/utility/interface/process_thread.h" #include "webrtc/modules/video_render/include/video_render.h" #include "webrtc/modules/video_render/include/video_render_defines.h" -#include "webrtc/system_wrappers/interface/sleep.h" -#include "webrtc/system_wrappers/interface/tick_util.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/sleep.h" +#include "webrtc/system_wrappers/include/tick_util.h" +#include "webrtc/system_wrappers/include/trace.h" using namespace webrtc; diff --git a/webrtc/modules/video_render/test/testAPI/testAPI_mac.mm b/webrtc/modules/video_render/test/testAPI/testAPI_mac.mm index 8ebb9ce609..dd57397c73 100644 --- a/webrtc/modules/video_render/test/testAPI/testAPI_mac.mm +++ b/webrtc/modules/video_render/test/testAPI/testAPI_mac.mm @@ -24,8 +24,8 @@ #include "webrtc/modules/utility/interface/process_thread.h" #include "webrtc/modules/video_render/include/video_render.h" #include "webrtc/modules/video_render/include/video_render_defines.h" -#include "webrtc/system_wrappers/interface/tick_util.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/tick_util.h" +#include "webrtc/system_wrappers/include/trace.h" using namespace webrtc; diff --git a/webrtc/modules/video_render/video_render_impl.cc b/webrtc/modules/video_render/video_render_impl.cc index 49cd6a2e81..32ec2b0e75 100644 --- a/webrtc/modules/video_render/video_render_impl.cc +++ b/webrtc/modules/video_render/video_render_impl.cc @@ -16,8 +16,8 @@ #include "webrtc/modules/video_render/i_video_render.h" #include "webrtc/modules/video_render/include/video_render_defines.h" #include "webrtc/modules/video_render/video_render_impl.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { diff --git a/webrtc/modules/video_render/video_render_internal_impl.cc b/webrtc/modules/video_render/video_render_internal_impl.cc index c856f484c3..09ebc7e548 100644 --- a/webrtc/modules/video_render/video_render_internal_impl.cc +++ b/webrtc/modules/video_render/video_render_internal_impl.cc @@ -15,8 +15,8 @@ #include "webrtc/modules/video_render/i_video_render.h" #include "webrtc/modules/video_render/include/video_render_defines.h" #include "webrtc/modules/video_render/video_render_impl.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" #if defined (_WIN32) #include "webrtc/modules/video_render/windows/video_render_windows_impl.h" diff --git a/webrtc/modules/video_render/windows/video_render_direct3d9.cc b/webrtc/modules/video_render/windows/video_render_direct3d9.cc index dab4e7a608..24dd0efddb 100644 --- a/webrtc/modules/video_render/windows/video_render_direct3d9.cc +++ b/webrtc/modules/video_render/windows/video_render_direct3d9.cc @@ -16,9 +16,9 @@ // WebRtc include files #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { diff --git a/webrtc/modules/video_render/windows/video_render_direct3d9.h b/webrtc/modules/video_render/windows/video_render_direct3d9.h index 15379b8f98..c8f6639d9a 100644 --- a/webrtc/modules/video_render/windows/video_render_direct3d9.h +++ b/webrtc/modules/video_render/windows/video_render_direct3d9.h @@ -20,7 +20,7 @@ // Added #include "webrtc/modules/video_render/include/video_render_defines.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" #pragma comment(lib, "d3d9.lib") // located in DirectX SDK diff --git a/webrtc/modules/video_render/windows/video_render_windows_impl.cc b/webrtc/modules/video_render/windows/video_render_windows_impl.cc index 38d897c0d3..042d7fdfa3 100644 --- a/webrtc/modules/video_render/windows/video_render_windows_impl.cc +++ b/webrtc/modules/video_render/windows/video_render_windows_impl.cc @@ -11,8 +11,8 @@ #include "webrtc/engine_configurations.h" #include "webrtc/modules/video_render/windows/video_render_windows_impl.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" #ifdef DIRECT3D9_RENDERING #include "webrtc/modules/video_render/windows/video_render_direct3d9.h" #endif diff --git a/webrtc/p2p/base/p2ptransportchannel.cc b/webrtc/p2p/base/p2ptransportchannel.cc index 5e5ba0156e..623085f9a8 100644 --- a/webrtc/p2p/base/p2ptransportchannel.cc +++ b/webrtc/p2p/base/p2ptransportchannel.cc @@ -19,7 +19,7 @@ #include "webrtc/base/crc32.h" #include "webrtc/base/logging.h" #include "webrtc/base/stringencode.h" -#include "webrtc/system_wrappers/interface/field_trial.h" +#include "webrtc/system_wrappers/include/field_trial.h" namespace { diff --git a/webrtc/system_wrappers/BUILD.gn b/webrtc/system_wrappers/BUILD.gn index c01afe6d3b..2f68eae634 100644 --- a/webrtc/system_wrappers/BUILD.gn +++ b/webrtc/system_wrappers/BUILD.gn @@ -11,38 +11,38 @@ import("../build/webrtc.gni") static_library("system_wrappers") { sources = [ - "interface/aligned_array.h", - "interface/aligned_malloc.h", - "interface/atomic32.h", - "interface/clock.h", - "interface/condition_variable_wrapper.h", - "interface/cpu_features_wrapper.h", - "interface/cpu_info.h", - "interface/critical_section_wrapper.h", - "interface/data_log.h", - "interface/data_log_c.h", - "interface/data_log_impl.h", - "interface/event_tracer.h", - "interface/event_wrapper.h", - "interface/field_trial.h", - "interface/file_wrapper.h", - "interface/fix_interlocked_exchange_pointer_win.h", - "interface/logging.h", - "interface/metrics.h", - "interface/ref_count.h", - "interface/rtp_to_ntp.h", - "interface/rw_lock_wrapper.h", - "interface/scoped_vector.h", - "interface/sleep.h", - "interface/sort.h", - "interface/static_instance.h", - "interface/stl_util.h", - "interface/stringize_macros.h", - "interface/thread_wrapper.h", - "interface/tick_util.h", - "interface/timestamp_extrapolator.h", - "interface/trace.h", - "interface/utf_util_win.h", + "include/aligned_array.h", + "include/aligned_malloc.h", + "include/atomic32.h", + "include/clock.h", + "include/condition_variable_wrapper.h", + "include/cpu_features_wrapper.h", + "include/cpu_info.h", + "include/critical_section_wrapper.h", + "include/data_log.h", + "include/data_log_c.h", + "include/data_log_impl.h", + "include/event_tracer.h", + "include/event_wrapper.h", + "include/field_trial.h", + "include/file_wrapper.h", + "include/fix_interlocked_exchange_pointer_win.h", + "include/logging.h", + "include/metrics.h", + "include/ref_count.h", + "include/rtp_to_ntp.h", + "include/rw_lock_wrapper.h", + "include/scoped_vector.h", + "include/sleep.h", + "include/sort.h", + "include/static_instance.h", + "include/stl_util.h", + "include/stringize_macros.h", + "include/thread_wrapper.h", + "include/tick_util.h", + "include/timestamp_extrapolator.h", + "include/trace.h", + "include/utf_util_win.h", "source/aligned_malloc.cc", "source/atomic32_mac.cc", "source/atomic32_win.cc", @@ -114,7 +114,7 @@ static_library("system_wrappers") { if (is_android) { sources += [ - "interface/logcat_trace_context.h", + "include/logcat_trace_context.h", "source/logcat_trace_context.cc", ] @@ -173,7 +173,7 @@ static_library("system_wrappers") { source_set("field_trial_default") { sources = [ - "interface/field_trial_default.h", + "include/field_trial_default.h", "source/field_trial_default.cc", ] diff --git a/webrtc/system_wrappers/interface/aligned_array.h b/webrtc/system_wrappers/include/aligned_array.h similarity index 97% rename from webrtc/system_wrappers/interface/aligned_array.h rename to webrtc/system_wrappers/include/aligned_array.h index 6d6c81b15c..a3a5911e36 100644 --- a/webrtc/system_wrappers/interface/aligned_array.h +++ b/webrtc/system_wrappers/include/aligned_array.h @@ -12,7 +12,7 @@ #define WEBRTC_SYSTEM_WRAPPERS_INTERFACE_ALIGNED_ARRAY_ #include "webrtc/base/checks.h" -#include "webrtc/system_wrappers/interface/aligned_malloc.h" +#include "webrtc/system_wrappers/include/aligned_malloc.h" namespace webrtc { diff --git a/webrtc/system_wrappers/interface/aligned_malloc.h b/webrtc/system_wrappers/include/aligned_malloc.h similarity index 100% rename from webrtc/system_wrappers/interface/aligned_malloc.h rename to webrtc/system_wrappers/include/aligned_malloc.h diff --git a/webrtc/system_wrappers/interface/asm_defines.h b/webrtc/system_wrappers/include/asm_defines.h similarity index 100% rename from webrtc/system_wrappers/interface/asm_defines.h rename to webrtc/system_wrappers/include/asm_defines.h diff --git a/webrtc/system_wrappers/interface/atomic32.h b/webrtc/system_wrappers/include/atomic32.h similarity index 100% rename from webrtc/system_wrappers/interface/atomic32.h rename to webrtc/system_wrappers/include/atomic32.h diff --git a/webrtc/system_wrappers/interface/clock.h b/webrtc/system_wrappers/include/clock.h similarity index 97% rename from webrtc/system_wrappers/interface/clock.h rename to webrtc/system_wrappers/include/clock.h index a103d95155..14253ba560 100644 --- a/webrtc/system_wrappers/interface/clock.h +++ b/webrtc/system_wrappers/include/clock.h @@ -12,7 +12,7 @@ #define WEBRTC_SYSTEM_WRAPPERS_INTERFACE_CLOCK_H_ #include "webrtc/base/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h" +#include "webrtc/system_wrappers/include/rw_lock_wrapper.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/system_wrappers/interface/compile_assert_c.h b/webrtc/system_wrappers/include/compile_assert_c.h similarity index 100% rename from webrtc/system_wrappers/interface/compile_assert_c.h rename to webrtc/system_wrappers/include/compile_assert_c.h diff --git a/webrtc/system_wrappers/interface/condition_variable_wrapper.h b/webrtc/system_wrappers/include/condition_variable_wrapper.h similarity index 100% rename from webrtc/system_wrappers/interface/condition_variable_wrapper.h rename to webrtc/system_wrappers/include/condition_variable_wrapper.h diff --git a/webrtc/system_wrappers/interface/cpu_features_wrapper.h b/webrtc/system_wrappers/include/cpu_features_wrapper.h similarity index 100% rename from webrtc/system_wrappers/interface/cpu_features_wrapper.h rename to webrtc/system_wrappers/include/cpu_features_wrapper.h diff --git a/webrtc/system_wrappers/interface/cpu_info.h b/webrtc/system_wrappers/include/cpu_info.h similarity index 100% rename from webrtc/system_wrappers/interface/cpu_info.h rename to webrtc/system_wrappers/include/cpu_info.h diff --git a/webrtc/system_wrappers/interface/critical_section_wrapper.h b/webrtc/system_wrappers/include/critical_section_wrapper.h similarity index 100% rename from webrtc/system_wrappers/interface/critical_section_wrapper.h rename to webrtc/system_wrappers/include/critical_section_wrapper.h diff --git a/webrtc/system_wrappers/interface/data_log.h b/webrtc/system_wrappers/include/data_log.h similarity index 98% rename from webrtc/system_wrappers/interface/data_log.h rename to webrtc/system_wrappers/include/data_log.h index 9608f2c420..cf095674a3 100644 --- a/webrtc/system_wrappers/interface/data_log.h +++ b/webrtc/system_wrappers/include/data_log.h @@ -33,7 +33,7 @@ #include -#include "webrtc/system_wrappers/interface/data_log_impl.h" +#include "webrtc/system_wrappers/include/data_log_impl.h" namespace webrtc { diff --git a/webrtc/system_wrappers/interface/data_log_c.h b/webrtc/system_wrappers/include/data_log_c.h similarity index 100% rename from webrtc/system_wrappers/interface/data_log_c.h rename to webrtc/system_wrappers/include/data_log_c.h diff --git a/webrtc/system_wrappers/interface/data_log_impl.h b/webrtc/system_wrappers/include/data_log_impl.h similarity index 98% rename from webrtc/system_wrappers/interface/data_log_impl.h rename to webrtc/system_wrappers/include/data_log_impl.h index 61a4e29754..56d98f891e 100644 --- a/webrtc/system_wrappers/interface/data_log_impl.h +++ b/webrtc/system_wrappers/include/data_log_impl.h @@ -23,7 +23,7 @@ #include #include "webrtc/base/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/system_wrappers/interface/event_tracer.h b/webrtc/system_wrappers/include/event_tracer.h similarity index 100% rename from webrtc/system_wrappers/interface/event_tracer.h rename to webrtc/system_wrappers/include/event_tracer.h diff --git a/webrtc/system_wrappers/interface/event_wrapper.h b/webrtc/system_wrappers/include/event_wrapper.h similarity index 100% rename from webrtc/system_wrappers/interface/event_wrapper.h rename to webrtc/system_wrappers/include/event_wrapper.h diff --git a/webrtc/system_wrappers/interface/field_trial.h b/webrtc/system_wrappers/include/field_trial.h similarity index 100% rename from webrtc/system_wrappers/interface/field_trial.h rename to webrtc/system_wrappers/include/field_trial.h diff --git a/webrtc/system_wrappers/interface/field_trial_default.h b/webrtc/system_wrappers/include/field_trial_default.h similarity index 100% rename from webrtc/system_wrappers/interface/field_trial_default.h rename to webrtc/system_wrappers/include/field_trial_default.h diff --git a/webrtc/system_wrappers/interface/file_wrapper.h b/webrtc/system_wrappers/include/file_wrapper.h similarity index 100% rename from webrtc/system_wrappers/interface/file_wrapper.h rename to webrtc/system_wrappers/include/file_wrapper.h diff --git a/webrtc/system_wrappers/interface/fix_interlocked_exchange_pointer_win.h b/webrtc/system_wrappers/include/fix_interlocked_exchange_pointer_win.h similarity index 100% rename from webrtc/system_wrappers/interface/fix_interlocked_exchange_pointer_win.h rename to webrtc/system_wrappers/include/fix_interlocked_exchange_pointer_win.h diff --git a/webrtc/system_wrappers/interface/logcat_trace_context.h b/webrtc/system_wrappers/include/logcat_trace_context.h similarity index 95% rename from webrtc/system_wrappers/interface/logcat_trace_context.h rename to webrtc/system_wrappers/include/logcat_trace_context.h index d23e451f2e..0b74734043 100644 --- a/webrtc/system_wrappers/interface/logcat_trace_context.h +++ b/webrtc/system_wrappers/include/logcat_trace_context.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_SYSTEM_WRAPPERS_INTERFACE_LOGCAT_TRACE_CONTEXT_H_ #define WEBRTC_SYSTEM_WRAPPERS_INTERFACE_LOGCAT_TRACE_CONTEXT_H_ -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" #ifndef ANDROID #error This file only makes sense to include on Android! diff --git a/webrtc/system_wrappers/interface/logging.h b/webrtc/system_wrappers/include/logging.h similarity index 100% rename from webrtc/system_wrappers/interface/logging.h rename to webrtc/system_wrappers/include/logging.h diff --git a/webrtc/system_wrappers/interface/metrics.h b/webrtc/system_wrappers/include/metrics.h similarity index 100% rename from webrtc/system_wrappers/interface/metrics.h rename to webrtc/system_wrappers/include/metrics.h diff --git a/webrtc/system_wrappers/interface/ref_count.h b/webrtc/system_wrappers/include/ref_count.h similarity index 97% rename from webrtc/system_wrappers/interface/ref_count.h rename to webrtc/system_wrappers/include/ref_count.h index bbf2c605e8..8ca06cdf6c 100644 --- a/webrtc/system_wrappers/interface/ref_count.h +++ b/webrtc/system_wrappers/include/ref_count.h @@ -11,7 +11,7 @@ #ifndef SYSTEM_WRAPPERS_INTERFACE_REF_COUNT_H_ #define SYSTEM_WRAPPERS_INTERFACE_REF_COUNT_H_ -#include "webrtc/system_wrappers/interface/atomic32.h" +#include "webrtc/system_wrappers/include/atomic32.h" namespace webrtc { diff --git a/webrtc/system_wrappers/interface/rtp_to_ntp.h b/webrtc/system_wrappers/include/rtp_to_ntp.h similarity index 100% rename from webrtc/system_wrappers/interface/rtp_to_ntp.h rename to webrtc/system_wrappers/include/rtp_to_ntp.h diff --git a/webrtc/system_wrappers/interface/rw_lock_wrapper.h b/webrtc/system_wrappers/include/rw_lock_wrapper.h similarity index 100% rename from webrtc/system_wrappers/interface/rw_lock_wrapper.h rename to webrtc/system_wrappers/include/rw_lock_wrapper.h diff --git a/webrtc/system_wrappers/interface/scoped_vector.h b/webrtc/system_wrappers/include/scoped_vector.h similarity index 98% rename from webrtc/system_wrappers/interface/scoped_vector.h rename to webrtc/system_wrappers/include/scoped_vector.h index 1a70a2c755..1e89a9d245 100644 --- a/webrtc/system_wrappers/interface/scoped_vector.h +++ b/webrtc/system_wrappers/include/scoped_vector.h @@ -16,7 +16,7 @@ #include #include "webrtc/base/checks.h" -#include "webrtc/system_wrappers/interface/stl_util.h" +#include "webrtc/system_wrappers/include/stl_util.h" namespace webrtc { diff --git a/webrtc/system_wrappers/interface/sleep.h b/webrtc/system_wrappers/include/sleep.h similarity index 100% rename from webrtc/system_wrappers/interface/sleep.h rename to webrtc/system_wrappers/include/sleep.h diff --git a/webrtc/system_wrappers/interface/sort.h b/webrtc/system_wrappers/include/sort.h similarity index 100% rename from webrtc/system_wrappers/interface/sort.h rename to webrtc/system_wrappers/include/sort.h diff --git a/webrtc/system_wrappers/interface/static_instance.h b/webrtc/system_wrappers/include/static_instance.h similarity index 96% rename from webrtc/system_wrappers/interface/static_instance.h rename to webrtc/system_wrappers/include/static_instance.h index dad9c52dc9..fd986b821d 100644 --- a/webrtc/system_wrappers/interface/static_instance.h +++ b/webrtc/system_wrappers/include/static_instance.h @@ -13,9 +13,9 @@ #include -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" #ifdef _WIN32 -#include "webrtc/system_wrappers/interface/fix_interlocked_exchange_pointer_win.h" +#include "webrtc/system_wrappers/include/fix_interlocked_exchange_pointer_win.h" #endif namespace webrtc { diff --git a/webrtc/system_wrappers/interface/stl_util.h b/webrtc/system_wrappers/include/stl_util.h similarity index 100% rename from webrtc/system_wrappers/interface/stl_util.h rename to webrtc/system_wrappers/include/stl_util.h diff --git a/webrtc/system_wrappers/interface/stringize_macros.h b/webrtc/system_wrappers/include/stringize_macros.h similarity index 100% rename from webrtc/system_wrappers/interface/stringize_macros.h rename to webrtc/system_wrappers/include/stringize_macros.h diff --git a/webrtc/system_wrappers/interface/thread_wrapper.h b/webrtc/system_wrappers/include/thread_wrapper.h similarity index 100% rename from webrtc/system_wrappers/interface/thread_wrapper.h rename to webrtc/system_wrappers/include/thread_wrapper.h diff --git a/webrtc/system_wrappers/interface/tick_util.h b/webrtc/system_wrappers/include/tick_util.h similarity index 100% rename from webrtc/system_wrappers/interface/tick_util.h rename to webrtc/system_wrappers/include/tick_util.h diff --git a/webrtc/system_wrappers/interface/timestamp_extrapolator.h b/webrtc/system_wrappers/include/timestamp_extrapolator.h similarity index 96% rename from webrtc/system_wrappers/interface/timestamp_extrapolator.h rename to webrtc/system_wrappers/include/timestamp_extrapolator.h index b78cf64be1..b8a8b05d97 100644 --- a/webrtc/system_wrappers/interface/timestamp_extrapolator.h +++ b/webrtc/system_wrappers/include/timestamp_extrapolator.h @@ -11,7 +11,7 @@ #ifndef SYSTEM_WRAPPERS_INTERFACE_TIMESTAMP_EXTRAPOLATOR_H_ #define SYSTEM_WRAPPERS_INTERFACE_TIMESTAMP_EXTRAPOLATOR_H_ -#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h" +#include "webrtc/system_wrappers/include/rw_lock_wrapper.h" #include "webrtc/typedefs.h" namespace webrtc diff --git a/webrtc/system_wrappers/interface/trace.h b/webrtc/system_wrappers/include/trace.h similarity index 100% rename from webrtc/system_wrappers/interface/trace.h rename to webrtc/system_wrappers/include/trace.h diff --git a/webrtc/system_wrappers/interface/utf_util_win.h b/webrtc/system_wrappers/include/utf_util_win.h similarity index 100% rename from webrtc/system_wrappers/interface/utf_util_win.h rename to webrtc/system_wrappers/include/utf_util_win.h diff --git a/webrtc/system_wrappers/source/aligned_array_unittest.cc b/webrtc/system_wrappers/source/aligned_array_unittest.cc index 8b8d50dae1..8d898af03e 100644 --- a/webrtc/system_wrappers/source/aligned_array_unittest.cc +++ b/webrtc/system_wrappers/source/aligned_array_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/interface/aligned_array.h" +#include "webrtc/system_wrappers/include/aligned_array.h" #include diff --git a/webrtc/system_wrappers/source/aligned_malloc.cc b/webrtc/system_wrappers/source/aligned_malloc.cc index 258b6be92c..a654e97e75 100644 --- a/webrtc/system_wrappers/source/aligned_malloc.cc +++ b/webrtc/system_wrappers/source/aligned_malloc.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/interface/aligned_malloc.h" +#include "webrtc/system_wrappers/include/aligned_malloc.h" #include #include diff --git a/webrtc/system_wrappers/source/aligned_malloc_unittest.cc b/webrtc/system_wrappers/source/aligned_malloc_unittest.cc index 57c083be2c..3933c2ac05 100644 --- a/webrtc/system_wrappers/source/aligned_malloc_unittest.cc +++ b/webrtc/system_wrappers/source/aligned_malloc_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/interface/aligned_malloc.h" +#include "webrtc/system_wrappers/include/aligned_malloc.h" #if _WIN32 #include diff --git a/webrtc/system_wrappers/source/atomic32_mac.cc b/webrtc/system_wrappers/source/atomic32_mac.cc index d3728465d1..7c77d092b5 100644 --- a/webrtc/system_wrappers/source/atomic32_mac.cc +++ b/webrtc/system_wrappers/source/atomic32_mac.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/interface/atomic32.h" +#include "webrtc/system_wrappers/include/atomic32.h" #include #include diff --git a/webrtc/system_wrappers/source/atomic32_posix.cc b/webrtc/system_wrappers/source/atomic32_posix.cc index e6a491c59a..fbc9c2910e 100644 --- a/webrtc/system_wrappers/source/atomic32_posix.cc +++ b/webrtc/system_wrappers/source/atomic32_posix.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/interface/atomic32.h" +#include "webrtc/system_wrappers/include/atomic32.h" #include #include diff --git a/webrtc/system_wrappers/source/atomic32_win.cc b/webrtc/system_wrappers/source/atomic32_win.cc index f3c10f6b7c..cd4ce08580 100644 --- a/webrtc/system_wrappers/source/atomic32_win.cc +++ b/webrtc/system_wrappers/source/atomic32_win.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/interface/atomic32.h" +#include "webrtc/system_wrappers/include/atomic32.h" #include #include diff --git a/webrtc/system_wrappers/source/clock.cc b/webrtc/system_wrappers/source/clock.cc index 31c5226348..95df256f3c 100644 --- a/webrtc/system_wrappers/source/clock.cc +++ b/webrtc/system_wrappers/source/clock.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" #if defined(_WIN32) // Windows needs to be included before mmsystem.h @@ -20,8 +20,8 @@ #endif #include "webrtc/base/criticalsection.h" -#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/rw_lock_wrapper.h" +#include "webrtc/system_wrappers/include/tick_util.h" namespace webrtc { diff --git a/webrtc/system_wrappers/source/clock_unittest.cc b/webrtc/system_wrappers/source/clock_unittest.cc index 8672d3966e..9cb8ec73d0 100644 --- a/webrtc/system_wrappers/source/clock_unittest.cc +++ b/webrtc/system_wrappers/source/clock_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/webrtc/system_wrappers/source/condition_variable.cc b/webrtc/system_wrappers/source/condition_variable.cc index 577949d329..f5ae93adc6 100644 --- a/webrtc/system_wrappers/source/condition_variable.cc +++ b/webrtc/system_wrappers/source/condition_variable.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/interface/condition_variable_wrapper.h" +#include "webrtc/system_wrappers/include/condition_variable_wrapper.h" #if defined(_WIN32) #include diff --git a/webrtc/system_wrappers/source/condition_variable_event_win.h b/webrtc/system_wrappers/source/condition_variable_event_win.h index fce45d3daa..cdcef7dcb8 100644 --- a/webrtc/system_wrappers/source/condition_variable_event_win.h +++ b/webrtc/system_wrappers/source/condition_variable_event_win.h @@ -13,7 +13,7 @@ #include -#include "webrtc/system_wrappers/interface/condition_variable_wrapper.h" +#include "webrtc/system_wrappers/include/condition_variable_wrapper.h" namespace webrtc { diff --git a/webrtc/system_wrappers/source/condition_variable_native_win.cc b/webrtc/system_wrappers/source/condition_variable_native_win.cc index 22ddb6f8fd..45225f2016 100644 --- a/webrtc/system_wrappers/source/condition_variable_native_win.cc +++ b/webrtc/system_wrappers/source/condition_variable_native_win.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/system_wrappers/source/condition_variable_native_win.h" #include "webrtc/system_wrappers/source/critical_section_win.h" diff --git a/webrtc/system_wrappers/source/condition_variable_native_win.h b/webrtc/system_wrappers/source/condition_variable_native_win.h index 1fbce37387..c22787f2f2 100644 --- a/webrtc/system_wrappers/source/condition_variable_native_win.h +++ b/webrtc/system_wrappers/source/condition_variable_native_win.h @@ -13,7 +13,7 @@ #include -#include "webrtc/system_wrappers/interface/condition_variable_wrapper.h" +#include "webrtc/system_wrappers/include/condition_variable_wrapper.h" namespace webrtc { diff --git a/webrtc/system_wrappers/source/condition_variable_posix.h b/webrtc/system_wrappers/source/condition_variable_posix.h index b29e116d7f..0aab1f03de 100644 --- a/webrtc/system_wrappers/source/condition_variable_posix.h +++ b/webrtc/system_wrappers/source/condition_variable_posix.h @@ -13,7 +13,7 @@ #include -#include "webrtc/system_wrappers/interface/condition_variable_wrapper.h" +#include "webrtc/system_wrappers/include/condition_variable_wrapper.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/system_wrappers/source/condition_variable_unittest.cc b/webrtc/system_wrappers/source/condition_variable_unittest.cc index 6e8a1ec3b5..ed845cc21e 100644 --- a/webrtc/system_wrappers/source/condition_variable_unittest.cc +++ b/webrtc/system_wrappers/source/condition_variable_unittest.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/interface/condition_variable_wrapper.h" +#include "webrtc/system_wrappers/include/condition_variable_wrapper.h" #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/base/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" -#include "webrtc/system_wrappers/interface/tick_util.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" +#include "webrtc/system_wrappers/include/tick_util.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { diff --git a/webrtc/system_wrappers/source/cpu_features.cc b/webrtc/system_wrappers/source/cpu_features.cc index b924d773a9..49840eb90d 100644 --- a/webrtc/system_wrappers/source/cpu_features.cc +++ b/webrtc/system_wrappers/source/cpu_features.cc @@ -10,7 +10,7 @@ // Parts of this file derived from Chromium's base/cpu.cc. -#include "webrtc/system_wrappers/interface/cpu_features_wrapper.h" +#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" #if defined(WEBRTC_ARCH_X86_FAMILY) && defined(_MSC_VER) #include diff --git a/webrtc/system_wrappers/source/cpu_info.cc b/webrtc/system_wrappers/source/cpu_info.cc index ebbb08a95c..40231b65af 100644 --- a/webrtc/system_wrappers/source/cpu_info.cc +++ b/webrtc/system_wrappers/source/cpu_info.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/interface/cpu_info.h" +#include "webrtc/system_wrappers/include/cpu_info.h" #include "webrtc/base/systeminfo.h" diff --git a/webrtc/system_wrappers/source/critical_section_posix.h b/webrtc/system_wrappers/source/critical_section_posix.h index d71c93de0a..099f74c2df 100644 --- a/webrtc/system_wrappers/source/critical_section_posix.h +++ b/webrtc/system_wrappers/source/critical_section_posix.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_SYSTEM_WRAPPERS_SOURCE_CRITICAL_SECTION_POSIX_H_ #define WEBRTC_SYSTEM_WRAPPERS_SOURCE_CRITICAL_SECTION_POSIX_H_ -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include diff --git a/webrtc/system_wrappers/source/critical_section_unittest.cc b/webrtc/system_wrappers/source/critical_section_unittest.cc index ec639eb673..6848bdd06b 100644 --- a/webrtc/system_wrappers/source/critical_section_unittest.cc +++ b/webrtc/system_wrappers/source/critical_section_unittest.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/system_wrappers/interface/sleep.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/sleep.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { diff --git a/webrtc/system_wrappers/source/critical_section_win.h b/webrtc/system_wrappers/source/critical_section_win.h index be237accaf..8268bc3017 100644 --- a/webrtc/system_wrappers/source/critical_section_win.h +++ b/webrtc/system_wrappers/source/critical_section_win.h @@ -12,7 +12,7 @@ #define WEBRTC_SYSTEM_WRAPPERS_SOURCE_CRITICAL_SECTION_WIN_H_ #include -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/system_wrappers/source/data_log.cc b/webrtc/system_wrappers/source/data_log.cc index 653af657dd..dbc8ea1505 100644 --- a/webrtc/system_wrappers/source/data_log.cc +++ b/webrtc/system_wrappers/source/data_log.cc @@ -8,17 +8,17 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/interface/data_log.h" +#include "webrtc/system_wrappers/include/data_log.h" #include #include #include -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/file_wrapper.h" -#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/file_wrapper.h" +#include "webrtc/system_wrappers/include/rw_lock_wrapper.h" namespace webrtc { diff --git a/webrtc/system_wrappers/source/data_log_c.cc b/webrtc/system_wrappers/source/data_log_c.cc index a11d545fc0..12a0d3f61a 100644 --- a/webrtc/system_wrappers/source/data_log_c.cc +++ b/webrtc/system_wrappers/source/data_log_c.cc @@ -10,11 +10,11 @@ // This is the pure C wrapper of the DataLog class. -#include "webrtc/system_wrappers/interface/data_log_c.h" +#include "webrtc/system_wrappers/include/data_log_c.h" #include -#include "webrtc/system_wrappers/interface/data_log.h" +#include "webrtc/system_wrappers/include/data_log.h" extern "C" int WebRtcDataLog_CreateLog() { return webrtc::DataLog::CreateLog(); diff --git a/webrtc/system_wrappers/source/data_log_c_helpers_unittest.c b/webrtc/system_wrappers/source/data_log_c_helpers_unittest.c index 524bd24e1c..0b05e224eb 100644 --- a/webrtc/system_wrappers/source/data_log_c_helpers_unittest.c +++ b/webrtc/system_wrappers/source/data_log_c_helpers_unittest.c @@ -14,7 +14,7 @@ #include #include -#include "webrtc/system_wrappers/interface/data_log_c.h" +#include "webrtc/system_wrappers/include/data_log_c.h" enum { kTestArrayLen = 4 }; static const char kTableName[] = "c_wrapper_table"; diff --git a/webrtc/system_wrappers/source/data_log_helpers_unittest.cc b/webrtc/system_wrappers/source/data_log_helpers_unittest.cc index 820d8cb4f3..25e1827ddb 100644 --- a/webrtc/system_wrappers/source/data_log_helpers_unittest.cc +++ b/webrtc/system_wrappers/source/data_log_helpers_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/interface/data_log.h" +#include "webrtc/system_wrappers/include/data_log.h" #include diff --git a/webrtc/system_wrappers/source/data_log_no_op.cc b/webrtc/system_wrappers/source/data_log_no_op.cc index f5b0ea855f..bdd2b0a403 100644 --- a/webrtc/system_wrappers/source/data_log_no_op.cc +++ b/webrtc/system_wrappers/source/data_log_no_op.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/interface/data_log.h" +#include "webrtc/system_wrappers/include/data_log.h" #include diff --git a/webrtc/system_wrappers/source/data_log_unittest.cc b/webrtc/system_wrappers/source/data_log_unittest.cc index e36226992f..53f201ca5f 100644 --- a/webrtc/system_wrappers/source/data_log_unittest.cc +++ b/webrtc/system_wrappers/source/data_log_unittest.cc @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/interface/data_log.h" +#include "webrtc/system_wrappers/include/data_log.h" #include #include #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/system_wrappers/interface/data_log_c.h" +#include "webrtc/system_wrappers/include/data_log_c.h" #include "webrtc/system_wrappers/source/data_log_c_helpers_unittest.h" using ::webrtc::DataLog; diff --git a/webrtc/system_wrappers/source/data_log_unittest_disabled.cc b/webrtc/system_wrappers/source/data_log_unittest_disabled.cc index 02d3cdb68c..1855a3e74f 100644 --- a/webrtc/system_wrappers/source/data_log_unittest_disabled.cc +++ b/webrtc/system_wrappers/source/data_log_unittest_disabled.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/interface/data_log.h" +#include "webrtc/system_wrappers/include/data_log.h" #include diff --git a/webrtc/system_wrappers/source/event.cc b/webrtc/system_wrappers/source/event.cc index 7f4f0557cc..05f918ffc2 100644 --- a/webrtc/system_wrappers/source/event.cc +++ b/webrtc/system_wrappers/source/event.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/interface/event_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" #if defined(_WIN32) #include diff --git a/webrtc/system_wrappers/source/event_timer_posix.h b/webrtc/system_wrappers/source/event_timer_posix.h index 593e8a4600..21c4ac702e 100644 --- a/webrtc/system_wrappers/source/event_timer_posix.h +++ b/webrtc/system_wrappers/source/event_timer_posix.h @@ -11,12 +11,12 @@ #ifndef WEBRTC_SYSTEM_WRAPPERS_SOURCE_EVENT_POSIX_H_ #define WEBRTC_SYSTEM_WRAPPERS_SOURCE_EVENT_POSIX_H_ -#include "webrtc/system_wrappers/interface/event_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" #include #include -#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" namespace webrtc { diff --git a/webrtc/system_wrappers/source/event_timer_win.h b/webrtc/system_wrappers/source/event_timer_win.h index d5bcd2c200..163cddeda9 100644 --- a/webrtc/system_wrappers/source/event_timer_win.h +++ b/webrtc/system_wrappers/source/event_timer_win.h @@ -13,7 +13,7 @@ #include -#include "webrtc/system_wrappers/interface/event_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/typedefs.h" diff --git a/webrtc/system_wrappers/source/field_trial_default.cc b/webrtc/system_wrappers/source/field_trial_default.cc index 97b703f6b1..1a9bd6bc79 100644 --- a/webrtc/system_wrappers/source/field_trial_default.cc +++ b/webrtc/system_wrappers/source/field_trial_default.cc @@ -7,8 +7,8 @@ // be found in the AUTHORS file in the root of the source tree. // -#include "webrtc/system_wrappers/interface/field_trial.h" -#include "webrtc/system_wrappers/interface/field_trial_default.h" +#include "webrtc/system_wrappers/include/field_trial.h" +#include "webrtc/system_wrappers/include/field_trial_default.h" #include diff --git a/webrtc/system_wrappers/source/file_impl.cc b/webrtc/system_wrappers/source/file_impl.cc index 89a918514a..0ee0deab6c 100644 --- a/webrtc/system_wrappers/source/file_impl.cc +++ b/webrtc/system_wrappers/source/file_impl.cc @@ -20,7 +20,7 @@ #endif #include "webrtc/base/checks.h" -#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h" +#include "webrtc/system_wrappers/include/rw_lock_wrapper.h" namespace webrtc { diff --git a/webrtc/system_wrappers/source/file_impl.h b/webrtc/system_wrappers/source/file_impl.h index e6679aa8e0..06ba58200b 100644 --- a/webrtc/system_wrappers/source/file_impl.h +++ b/webrtc/system_wrappers/source/file_impl.h @@ -14,7 +14,7 @@ #include #include "webrtc/base/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/file_wrapper.h" +#include "webrtc/system_wrappers/include/file_wrapper.h" namespace webrtc { diff --git a/webrtc/system_wrappers/source/logcat_trace_context.cc b/webrtc/system_wrappers/source/logcat_trace_context.cc index 313acc74e8..cc2e45b28e 100644 --- a/webrtc/system_wrappers/source/logcat_trace_context.cc +++ b/webrtc/system_wrappers/source/logcat_trace_context.cc @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/interface/logcat_trace_context.h" +#include "webrtc/system_wrappers/include/logcat_trace_context.h" #include #include -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" namespace webrtc { diff --git a/webrtc/system_wrappers/source/logging.cc b/webrtc/system_wrappers/source/logging.cc index 45a0985454..6b50d6acf8 100644 --- a/webrtc/system_wrappers/source/logging.cc +++ b/webrtc/system_wrappers/source/logging.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" #include #include #include "webrtc/common_types.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { namespace { diff --git a/webrtc/system_wrappers/source/logging_unittest.cc b/webrtc/system_wrappers/source/logging_unittest.cc index 39bca65689..633d84b76b 100644 --- a/webrtc/system_wrappers/source/logging_unittest.cc +++ b/webrtc/system_wrappers/source/logging_unittest.cc @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/base/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/condition_variable_wrapper.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/sleep.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/condition_variable_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/sleep.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { namespace { diff --git a/webrtc/system_wrappers/source/metrics_default.cc b/webrtc/system_wrappers/source/metrics_default.cc index af950b4d91..48c9111e1b 100644 --- a/webrtc/system_wrappers/source/metrics_default.cc +++ b/webrtc/system_wrappers/source/metrics_default.cc @@ -7,7 +7,7 @@ // be found in the AUTHORS file in the root of the source tree. // -#include "webrtc/system_wrappers/interface/metrics.h" +#include "webrtc/system_wrappers/include/metrics.h" // Default implementation of histogram methods for WebRTC clients that do not // want to provide their own implementation. diff --git a/webrtc/system_wrappers/source/rtp_to_ntp.cc b/webrtc/system_wrappers/source/rtp_to_ntp.cc index d6b7b14084..0aceb0625f 100644 --- a/webrtc/system_wrappers/source/rtp_to_ntp.cc +++ b/webrtc/system_wrappers/source/rtp_to_ntp.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/interface/rtp_to_ntp.h" +#include "webrtc/system_wrappers/include/rtp_to_ntp.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" #include diff --git a/webrtc/system_wrappers/source/rtp_to_ntp_unittest.cc b/webrtc/system_wrappers/source/rtp_to_ntp_unittest.cc index a4d75aed04..4c166774a4 100644 --- a/webrtc/system_wrappers/source/rtp_to_ntp_unittest.cc +++ b/webrtc/system_wrappers/source/rtp_to_ntp_unittest.cc @@ -9,7 +9,7 @@ */ #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/system_wrappers/interface/rtp_to_ntp.h" +#include "webrtc/system_wrappers/include/rtp_to_ntp.h" namespace webrtc { diff --git a/webrtc/system_wrappers/source/rw_lock.cc b/webrtc/system_wrappers/source/rw_lock.cc index 8b76eb8614..ff44896dbe 100644 --- a/webrtc/system_wrappers/source/rw_lock.cc +++ b/webrtc/system_wrappers/source/rw_lock.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h" +#include "webrtc/system_wrappers/include/rw_lock_wrapper.h" #include diff --git a/webrtc/system_wrappers/source/rw_lock_generic.cc b/webrtc/system_wrappers/source/rw_lock_generic.cc index 0ca9518747..9786155a63 100644 --- a/webrtc/system_wrappers/source/rw_lock_generic.cc +++ b/webrtc/system_wrappers/source/rw_lock_generic.cc @@ -10,8 +10,8 @@ #include "webrtc/system_wrappers/source/rw_lock_generic.h" -#include "webrtc/system_wrappers/interface/condition_variable_wrapper.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/condition_variable_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" namespace webrtc { diff --git a/webrtc/system_wrappers/source/rw_lock_generic.h b/webrtc/system_wrappers/source/rw_lock_generic.h index 653564c186..f0d445692e 100644 --- a/webrtc/system_wrappers/source/rw_lock_generic.h +++ b/webrtc/system_wrappers/source/rw_lock_generic.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_SYSTEM_WRAPPERS_SOURCE_RW_LOCK_GENERIC_H_ #define WEBRTC_SYSTEM_WRAPPERS_SOURCE_RW_LOCK_GENERIC_H_ -#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h" +#include "webrtc/system_wrappers/include/rw_lock_wrapper.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/system_wrappers/source/rw_lock_posix.h b/webrtc/system_wrappers/source/rw_lock_posix.h index bec3c2de55..0ce7305b60 100644 --- a/webrtc/system_wrappers/source/rw_lock_posix.h +++ b/webrtc/system_wrappers/source/rw_lock_posix.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_SYSTEM_WRAPPERS_SOURCE_RW_LOCK_POSIX_H_ #define WEBRTC_SYSTEM_WRAPPERS_SOURCE_RW_LOCK_POSIX_H_ -#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h" +#include "webrtc/system_wrappers/include/rw_lock_wrapper.h" #include "webrtc/typedefs.h" #include diff --git a/webrtc/system_wrappers/source/rw_lock_win.cc b/webrtc/system_wrappers/source/rw_lock_win.cc index aea74fa4a3..2372b9b503 100644 --- a/webrtc/system_wrappers/source/rw_lock_win.cc +++ b/webrtc/system_wrappers/source/rw_lock_win.cc @@ -10,7 +10,7 @@ #include "webrtc/system_wrappers/source/rw_lock_win.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { diff --git a/webrtc/system_wrappers/source/rw_lock_win.h b/webrtc/system_wrappers/source/rw_lock_win.h index 6f7cd3344e..c279eaba44 100644 --- a/webrtc/system_wrappers/source/rw_lock_win.h +++ b/webrtc/system_wrappers/source/rw_lock_win.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_SYSTEM_WRAPPERS_SOURCE_RW_LOCK_WIN_H_ #define WEBRTC_SYSTEM_WRAPPERS_SOURCE_RW_LOCK_WIN_H_ -#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h" +#include "webrtc/system_wrappers/include/rw_lock_wrapper.h" #include diff --git a/webrtc/system_wrappers/source/scoped_vector_unittest.cc b/webrtc/system_wrappers/source/scoped_vector_unittest.cc index 43df26a42b..b049e4a340 100644 --- a/webrtc/system_wrappers/source/scoped_vector_unittest.cc +++ b/webrtc/system_wrappers/source/scoped_vector_unittest.cc @@ -10,7 +10,7 @@ // Borrowed from Chromium's src/base/memory/scoped_vector_unittest.cc -#include "webrtc/system_wrappers/interface/scoped_vector.h" +#include "webrtc/system_wrappers/include/scoped_vector.h" #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/base/scoped_ptr.h" diff --git a/webrtc/system_wrappers/source/sleep.cc b/webrtc/system_wrappers/source/sleep.cc index a916477e37..181381fd53 100644 --- a/webrtc/system_wrappers/source/sleep.cc +++ b/webrtc/system_wrappers/source/sleep.cc @@ -9,7 +9,7 @@ */ // An OS-independent sleep function. -#include "webrtc/system_wrappers/interface/sleep.h" +#include "webrtc/system_wrappers/include/sleep.h" #ifdef _WIN32 // For Sleep() diff --git a/webrtc/system_wrappers/source/sort.cc b/webrtc/system_wrappers/source/sort.cc index 9144a58c02..f166f95311 100644 --- a/webrtc/system_wrappers/source/sort.cc +++ b/webrtc/system_wrappers/source/sort.cc @@ -13,7 +13,7 @@ // part of the Boost C++ library collection. Otherwise, the C standard library's // qsort() will be used. -#include "webrtc/system_wrappers/interface/sort.h" +#include "webrtc/system_wrappers/include/sort.h" #include #include // memcpy diff --git a/webrtc/system_wrappers/source/stl_util_unittest.cc b/webrtc/system_wrappers/source/stl_util_unittest.cc index e60a913cfc..ed5c1d9590 100644 --- a/webrtc/system_wrappers/source/stl_util_unittest.cc +++ b/webrtc/system_wrappers/source/stl_util_unittest.cc @@ -9,7 +9,7 @@ */ // Borrowed from Chromium's src/base/stl_util_unittest.cc -#include "webrtc/system_wrappers/interface/stl_util.h" +#include "webrtc/system_wrappers/include/stl_util.h" #include diff --git a/webrtc/system_wrappers/source/stringize_macros_unittest.cc b/webrtc/system_wrappers/source/stringize_macros_unittest.cc index 8d953dd540..c2f312bf90 100644 --- a/webrtc/system_wrappers/source/stringize_macros_unittest.cc +++ b/webrtc/system_wrappers/source/stringize_macros_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/interface/stringize_macros.h" +#include "webrtc/system_wrappers/include/stringize_macros.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/webrtc/system_wrappers/source/thread.cc b/webrtc/system_wrappers/source/thread.cc index b469344bd1..7da1e3d591 100644 --- a/webrtc/system_wrappers/source/thread.cc +++ b/webrtc/system_wrappers/source/thread.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" #if defined(_WIN32) #include "webrtc/system_wrappers/source/thread_win.h" diff --git a/webrtc/system_wrappers/source/thread_posix.cc b/webrtc/system_wrappers/source/thread_posix.cc index fdfbf8056c..32ab13c780 100644 --- a/webrtc/system_wrappers/source/thread_posix.cc +++ b/webrtc/system_wrappers/source/thread_posix.cc @@ -22,10 +22,10 @@ #include "webrtc/base/checks.h" #include "webrtc/base/platform_thread.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/sleep.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/sleep.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { namespace { diff --git a/webrtc/system_wrappers/source/thread_posix.h b/webrtc/system_wrappers/source/thread_posix.h index c726e480cf..bcdd732f86 100644 --- a/webrtc/system_wrappers/source/thread_posix.h +++ b/webrtc/system_wrappers/source/thread_posix.h @@ -14,7 +14,7 @@ #include "webrtc/base/event.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/thread_checker.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" #include diff --git a/webrtc/system_wrappers/source/thread_unittest.cc b/webrtc/system_wrappers/source/thread_unittest.cc index 854f98bbd9..c8e180ba32 100644 --- a/webrtc/system_wrappers/source/thread_unittest.cc +++ b/webrtc/system_wrappers/source/thread_unittest.cc @@ -8,11 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/base/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/sleep.h" +#include "webrtc/system_wrappers/include/sleep.h" namespace webrtc { diff --git a/webrtc/system_wrappers/source/thread_win.cc b/webrtc/system_wrappers/source/thread_win.cc index 2773f7ef77..c42196722e 100644 --- a/webrtc/system_wrappers/source/thread_win.cc +++ b/webrtc/system_wrappers/source/thread_win.cc @@ -16,7 +16,7 @@ #include "webrtc/base/checks.h" #include "webrtc/base/platform_thread.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { namespace { diff --git a/webrtc/system_wrappers/source/thread_win.h b/webrtc/system_wrappers/source/thread_win.h index 741ae1ed05..34edd6d6c0 100644 --- a/webrtc/system_wrappers/source/thread_win.h +++ b/webrtc/system_wrappers/source/thread_win.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_SYSTEM_WRAPPERS_SOURCE_THREAD_WIN_H_ #define WEBRTC_SYSTEM_WRAPPERS_SOURCE_THREAD_WIN_H_ -#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" #include diff --git a/webrtc/system_wrappers/source/tick_util.cc b/webrtc/system_wrappers/source/tick_util.cc index 9602ab2e09..bc8fcfe91b 100644 --- a/webrtc/system_wrappers/source/tick_util.cc +++ b/webrtc/system_wrappers/source/tick_util.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/tick_util.h" #include diff --git a/webrtc/system_wrappers/source/timestamp_extrapolator.cc b/webrtc/system_wrappers/source/timestamp_extrapolator.cc index f2b7092686..c7ed856a54 100644 --- a/webrtc/system_wrappers/source/timestamp_extrapolator.cc +++ b/webrtc/system_wrappers/source/timestamp_extrapolator.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/interface/timestamp_extrapolator.h" +#include "webrtc/system_wrappers/include/timestamp_extrapolator.h" #include diff --git a/webrtc/system_wrappers/source/trace_impl.h b/webrtc/system_wrappers/source/trace_impl.h index da5af72c48..ed49d9d0aa 100644 --- a/webrtc/system_wrappers/source/trace_impl.h +++ b/webrtc/system_wrappers/source/trace_impl.h @@ -13,11 +13,11 @@ #include "webrtc/base/criticalsection.h" #include "webrtc/base/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/file_wrapper.h" -#include "webrtc/system_wrappers/interface/static_instance.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/file_wrapper.h" +#include "webrtc/system_wrappers/include/static_instance.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { diff --git a/webrtc/system_wrappers/source/trace_posix.h b/webrtc/system_wrappers/source/trace_posix.h index 89420c650f..25dfeec079 100644 --- a/webrtc/system_wrappers/source/trace_posix.h +++ b/webrtc/system_wrappers/source/trace_posix.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_SYSTEM_WRAPPERS_SOURCE_TRACE_POSIX_H_ #define WEBRTC_SYSTEM_WRAPPERS_SOURCE_TRACE_POSIX_H_ -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/system_wrappers/source/trace_impl.h" namespace webrtc { diff --git a/webrtc/system_wrappers/system_wrappers.gyp b/webrtc/system_wrappers/system_wrappers.gyp index a64661a773..f66437b37a 100644 --- a/webrtc/system_wrappers/system_wrappers.gyp +++ b/webrtc/system_wrappers/system_wrappers.gyp @@ -17,39 +17,39 @@ '../base/base.gyp:rtc_base_approved', ], 'sources': [ - 'interface/aligned_array.h', - 'interface/aligned_malloc.h', - 'interface/atomic32.h', - 'interface/clock.h', - 'interface/condition_variable_wrapper.h', - 'interface/cpu_info.h', - 'interface/cpu_features_wrapper.h', - 'interface/critical_section_wrapper.h', - 'interface/data_log.h', - 'interface/data_log_c.h', - 'interface/data_log_impl.h', - 'interface/event_tracer.h', - 'interface/event_wrapper.h', - 'interface/field_trial.h', - 'interface/file_wrapper.h', - 'interface/fix_interlocked_exchange_pointer_win.h', - 'interface/logcat_trace_context.h', - 'interface/logging.h', - 'interface/metrics.h', - 'interface/ref_count.h', - 'interface/rtp_to_ntp.h', - 'interface/rw_lock_wrapper.h', - 'interface/scoped_vector.h', - 'interface/sleep.h', - 'interface/sort.h', - 'interface/static_instance.h', - 'interface/stl_util.h', - 'interface/stringize_macros.h', - 'interface/thread_wrapper.h', - 'interface/tick_util.h', - 'interface/timestamp_extrapolator.h', - 'interface/trace.h', - 'interface/utf_util_win.h', + 'include/aligned_array.h', + 'include/aligned_malloc.h', + 'include/atomic32.h', + 'include/clock.h', + 'include/condition_variable_wrapper.h', + 'include/cpu_info.h', + 'include/cpu_features_wrapper.h', + 'include/critical_section_wrapper.h', + 'include/data_log.h', + 'include/data_log_c.h', + 'include/data_log_impl.h', + 'include/event_tracer.h', + 'include/event_wrapper.h', + 'include/field_trial.h', + 'include/file_wrapper.h', + 'include/fix_interlocked_exchange_pointer_win.h', + 'include/logcat_trace_context.h', + 'include/logging.h', + 'include/metrics.h', + 'include/ref_count.h', + 'include/rtp_to_ntp.h', + 'include/rw_lock_wrapper.h', + 'include/scoped_vector.h', + 'include/sleep.h', + 'include/sort.h', + 'include/static_instance.h', + 'include/stl_util.h', + 'include/stringize_macros.h', + 'include/thread_wrapper.h', + 'include/tick_util.h', + 'include/timestamp_extrapolator.h', + 'include/trace.h', + 'include/utf_util_win.h', 'source/aligned_malloc.cc', 'source/atomic32_mac.cc', 'source/atomic32_posix.cc', @@ -139,7 +139,7 @@ }, }, { # OS!="android" 'sources!': [ - 'interface/logcat_trace_context.h', + 'include/logcat_trace_context.h', 'source/logcat_trace_context.cc', ], }], @@ -197,7 +197,7 @@ 'target_name': 'field_trial_default', 'type': 'static_library', 'sources': [ - 'interface/field_trial_default.h', + 'include/field_trial_default.h', 'source/field_trial_default.cc', ] }, { diff --git a/webrtc/system_wrappers/test/TestSort/TestSort.cc b/webrtc/system_wrappers/test/TestSort/TestSort.cc index cfa47cfb95..b2b9f85755 100644 --- a/webrtc/system_wrappers/test/TestSort/TestSort.cc +++ b/webrtc/system_wrappers/test/TestSort/TestSort.cc @@ -13,8 +13,8 @@ #include -#include "webrtc/system_wrappers/interface/sort.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/sort.h" +#include "webrtc/system_wrappers/include/tick_util.h" // Excellent work polluting the global namespace Visual Studio... #undef max diff --git a/webrtc/test/call_test.h b/webrtc/test/call_test.h index d80d819859..10743240d1 100644 --- a/webrtc/test/call_test.h +++ b/webrtc/test/call_test.h @@ -13,7 +13,7 @@ #include #include "webrtc/call.h" -#include "webrtc/system_wrappers/interface/scoped_vector.h" +#include "webrtc/system_wrappers/include/scoped_vector.h" #include "webrtc/test/fake_decoder.h" #include "webrtc/test/fake_encoder.h" #include "webrtc/test/frame_generator_capturer.h" diff --git a/webrtc/test/channel_transport/traffic_control_win.cc b/webrtc/test/channel_transport/traffic_control_win.cc index 9aeda75b03..3584359758 100644 --- a/webrtc/test/channel_transport/traffic_control_win.cc +++ b/webrtc/test/channel_transport/traffic_control_win.cc @@ -12,7 +12,7 @@ #include -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { namespace test { diff --git a/webrtc/test/channel_transport/traffic_control_win.h b/webrtc/test/channel_transport/traffic_control_win.h index acd625ffdc..1197b94b20 100644 --- a/webrtc/test/channel_transport/traffic_control_win.h +++ b/webrtc/test/channel_transport/traffic_control_win.h @@ -23,7 +23,7 @@ #include #include -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { namespace test { diff --git a/webrtc/test/channel_transport/udp_socket2_manager_win.cc b/webrtc/test/channel_transport/udp_socket2_manager_win.cc index 55ddaee068..5a11abbd6e 100644 --- a/webrtc/test/channel_transport/udp_socket2_manager_win.cc +++ b/webrtc/test/channel_transport/udp_socket2_manager_win.cc @@ -13,7 +13,7 @@ #include #include -#include "webrtc/system_wrappers/interface/aligned_malloc.h" +#include "webrtc/system_wrappers/include/aligned_malloc.h" #include "webrtc/test/channel_transport/udp_socket2_win.h" namespace webrtc { diff --git a/webrtc/test/channel_transport/udp_socket2_manager_win.h b/webrtc/test/channel_transport/udp_socket2_manager_win.h index 7e4e805d0c..c6af03a702 100644 --- a/webrtc/test/channel_transport/udp_socket2_manager_win.h +++ b/webrtc/test/channel_transport/udp_socket2_manager_win.h @@ -14,10 +14,10 @@ #include #include -#include "webrtc/system_wrappers/interface/atomic32.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/include/atomic32.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" #include "webrtc/test/channel_transport/udp_socket2_win.h" #include "webrtc/test/channel_transport/udp_socket_manager_wrapper.h" #include "webrtc/test/channel_transport/udp_transport.h" diff --git a/webrtc/test/channel_transport/udp_socket2_win.cc b/webrtc/test/channel_transport/udp_socket2_win.cc index 6bcb551012..4c63dc938d 100644 --- a/webrtc/test/channel_transport/udp_socket2_win.cc +++ b/webrtc/test/channel_transport/udp_socket2_win.cc @@ -15,7 +15,7 @@ #include #include "webrtc/base/format_macros.h" -#include "webrtc/system_wrappers/interface/sleep.h" +#include "webrtc/system_wrappers/include/sleep.h" #include "webrtc/test/channel_transport/traffic_control_win.h" #include "webrtc/test/channel_transport/udp_socket2_manager_win.h" diff --git a/webrtc/test/channel_transport/udp_socket2_win.h b/webrtc/test/channel_transport/udp_socket2_win.h index 5d6b212b93..ea37ac47c5 100644 --- a/webrtc/test/channel_transport/udp_socket2_win.h +++ b/webrtc/test/channel_transport/udp_socket2_win.h @@ -19,12 +19,12 @@ #include #include -#include "webrtc/system_wrappers/interface/atomic32.h" -#include "webrtc/system_wrappers/interface/condition_variable_wrapper.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/atomic32.h" +#include "webrtc/system_wrappers/include/condition_variable_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/rw_lock_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/channel_transport/udp_socket2_manager_win.h" #include "webrtc/test/channel_transport/udp_socket_wrapper.h" diff --git a/webrtc/test/channel_transport/udp_socket_manager_posix.cc b/webrtc/test/channel_transport/udp_socket_manager_posix.cc index 9748400f11..145efcbc58 100644 --- a/webrtc/test/channel_transport/udp_socket_manager_posix.cc +++ b/webrtc/test/channel_transport/udp_socket_manager_posix.cc @@ -17,8 +17,8 @@ #include #include -#include "webrtc/system_wrappers/interface/sleep.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/sleep.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/channel_transport/udp_socket_posix.h" namespace webrtc { diff --git a/webrtc/test/channel_transport/udp_socket_manager_posix.h b/webrtc/test/channel_transport/udp_socket_manager_posix.h index e1fad9cf3d..64156fd20f 100644 --- a/webrtc/test/channel_transport/udp_socket_manager_posix.h +++ b/webrtc/test/channel_transport/udp_socket_manager_posix.h @@ -17,8 +17,8 @@ #include #include -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" #include "webrtc/test/channel_transport/udp_socket_manager_wrapper.h" #include "webrtc/test/channel_transport/udp_socket_wrapper.h" diff --git a/webrtc/test/channel_transport/udp_socket_manager_unittest.cc b/webrtc/test/channel_transport/udp_socket_manager_unittest.cc index d8e66b9395..b49021bffe 100644 --- a/webrtc/test/channel_transport/udp_socket_manager_unittest.cc +++ b/webrtc/test/channel_transport/udp_socket_manager_unittest.cc @@ -16,7 +16,7 @@ // The most important property of these tests is that they do not leak memory. #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/channel_transport/udp_socket_manager_wrapper.h" #include "webrtc/test/channel_transport/udp_socket_wrapper.h" diff --git a/webrtc/test/channel_transport/udp_socket_manager_wrapper.cc b/webrtc/test/channel_transport/udp_socket_manager_wrapper.cc index 2e84c28c84..3127767cbc 100644 --- a/webrtc/test/channel_transport/udp_socket_manager_wrapper.cc +++ b/webrtc/test/channel_transport/udp_socket_manager_wrapper.cc @@ -13,7 +13,7 @@ #include #ifdef _WIN32 -#include "webrtc/system_wrappers/interface/fix_interlocked_exchange_pointer_win.h" +#include "webrtc/system_wrappers/include/fix_interlocked_exchange_pointer_win.h" #include "webrtc/test/channel_transport/udp_socket2_manager_win.h" #else #include "webrtc/test/channel_transport/udp_socket_manager_posix.h" diff --git a/webrtc/test/channel_transport/udp_socket_manager_wrapper.h b/webrtc/test/channel_transport/udp_socket_manager_wrapper.h index 123db42983..0c3c3850d9 100644 --- a/webrtc/test/channel_transport/udp_socket_manager_wrapper.h +++ b/webrtc/test/channel_transport/udp_socket_manager_wrapper.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_SOCKET_MANAGER_WRAPPER_H_ #define WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_SOCKET_MANAGER_WRAPPER_H_ -#include "webrtc/system_wrappers/interface/static_instance.h" +#include "webrtc/system_wrappers/include/static_instance.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/test/channel_transport/udp_socket_posix.cc b/webrtc/test/channel_transport/udp_socket_posix.cc index a2c84e5651..639d444f55 100644 --- a/webrtc/test/channel_transport/udp_socket_posix.cc +++ b/webrtc/test/channel_transport/udp_socket_posix.cc @@ -20,7 +20,7 @@ #include #include -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/channel_transport/udp_socket_manager_wrapper.h" #include "webrtc/test/channel_transport/udp_socket_wrapper.h" diff --git a/webrtc/test/channel_transport/udp_socket_posix.h b/webrtc/test/channel_transport/udp_socket_posix.h index 6ddf7e5408..c391b2e397 100644 --- a/webrtc/test/channel_transport/udp_socket_posix.h +++ b/webrtc/test/channel_transport/udp_socket_posix.h @@ -16,8 +16,8 @@ #include #include -#include "webrtc/system_wrappers/interface/condition_variable_wrapper.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/condition_variable_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/test/channel_transport/udp_socket_wrapper.h" namespace webrtc { diff --git a/webrtc/test/channel_transport/udp_socket_wrapper.cc b/webrtc/test/channel_transport/udp_socket_wrapper.cc index 7dad0cffea..f4fa3e950b 100644 --- a/webrtc/test/channel_transport/udp_socket_wrapper.cc +++ b/webrtc/test/channel_transport/udp_socket_wrapper.cc @@ -13,8 +13,8 @@ #include #include -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/channel_transport/udp_socket_manager_wrapper.h" #if defined(_WIN32) diff --git a/webrtc/test/channel_transport/udp_transport_impl.cc b/webrtc/test/channel_transport/udp_transport_impl.cc index a530ec6f0c..c7049aa8a2 100644 --- a/webrtc/test/channel_transport/udp_transport_impl.cc +++ b/webrtc/test/channel_transport/udp_transport_impl.cc @@ -45,9 +45,9 @@ #endif #include "webrtc/common_types.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/rw_lock_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/channel_transport/udp_socket_manager_wrapper.h" #include "webrtc/typedefs.h" diff --git a/webrtc/test/direct_transport.cc b/webrtc/test/direct_transport.cc index ac56ec3828..6dcba81c88 100644 --- a/webrtc/test/direct_transport.cc +++ b/webrtc/test/direct_transport.cc @@ -12,7 +12,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/call.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" namespace webrtc { namespace test { diff --git a/webrtc/test/direct_transport.h b/webrtc/test/direct_transport.h index f910efafaf..241a5bc110 100644 --- a/webrtc/test/direct_transport.h +++ b/webrtc/test/direct_transport.h @@ -16,8 +16,8 @@ #include "webrtc/base/criticalsection.h" #include "webrtc/base/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" #include "webrtc/test/fake_network_pipe.h" #include "webrtc/transport.h" diff --git a/webrtc/test/fake_audio_device.cc b/webrtc/test/fake_audio_device.cc index 4309aed562..e307dd7664 100644 --- a/webrtc/test/fake_audio_device.cc +++ b/webrtc/test/fake_audio_device.cc @@ -14,10 +14,10 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/media_file/source/media_file_utility.h" -#include "webrtc/system_wrappers/interface/clock.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/file_wrapper.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/include/clock.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/file_wrapper.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" namespace webrtc { namespace test { diff --git a/webrtc/test/fake_decoder.h b/webrtc/test/fake_decoder.h index 01c0b44486..593af512f8 100644 --- a/webrtc/test/fake_decoder.h +++ b/webrtc/test/fake_decoder.h @@ -14,7 +14,7 @@ #include #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" namespace webrtc { namespace test { diff --git a/webrtc/test/fake_encoder.cc b/webrtc/test/fake_encoder.cc index db7a587596..a3ade6e97a 100644 --- a/webrtc/test/fake_encoder.cc +++ b/webrtc/test/fake_encoder.cc @@ -13,7 +13,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" -#include "webrtc/system_wrappers/interface/sleep.h" +#include "webrtc/system_wrappers/include/sleep.h" namespace webrtc { namespace test { diff --git a/webrtc/test/fake_encoder.h b/webrtc/test/fake_encoder.h index dc3a1aef50..d677b92e4d 100644 --- a/webrtc/test/fake_encoder.h +++ b/webrtc/test/fake_encoder.h @@ -14,7 +14,7 @@ #include #include "webrtc/common_types.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" #include "webrtc/video_encoder.h" namespace webrtc { diff --git a/webrtc/test/fake_network_pipe.cc b/webrtc/test/fake_network_pipe.cc index b3c9ee91ab..c36059356a 100644 --- a/webrtc/test/fake_network_pipe.cc +++ b/webrtc/test/fake_network_pipe.cc @@ -16,7 +16,7 @@ #include #include "webrtc/call.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/tick_util.h" namespace webrtc { diff --git a/webrtc/test/fake_network_pipe.h b/webrtc/test/fake_network_pipe.h index 0d19e765e2..74189a594c 100644 --- a/webrtc/test/fake_network_pipe.h +++ b/webrtc/test/fake_network_pipe.h @@ -16,7 +16,7 @@ #include "webrtc/base/constructormagic.h" #include "webrtc/base/criticalsection.h" #include "webrtc/base/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/test/fake_network_pipe_unittest.cc b/webrtc/test/fake_network_pipe_unittest.cc index a753fc5312..02438c59f3 100644 --- a/webrtc/test/fake_network_pipe_unittest.cc +++ b/webrtc/test/fake_network_pipe_unittest.cc @@ -13,7 +13,7 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/call.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/tick_util.h" #include "webrtc/test/fake_network_pipe.h" using ::testing::_; diff --git a/webrtc/test/field_trial.cc b/webrtc/test/field_trial.cc index 51bd920dab..613fb67679 100644 --- a/webrtc/test/field_trial.cc +++ b/webrtc/test/field_trial.cc @@ -17,7 +17,7 @@ #include #include -#include "webrtc/system_wrappers/interface/field_trial.h" +#include "webrtc/system_wrappers/include/field_trial.h" namespace webrtc { namespace { diff --git a/webrtc/test/frame_generator.cc b/webrtc/test/frame_generator.cc index db51261053..589dde4bad 100644 --- a/webrtc/test/frame_generator.cc +++ b/webrtc/test/frame_generator.cc @@ -15,7 +15,7 @@ #include "webrtc/base/checks.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" namespace webrtc { namespace test { diff --git a/webrtc/test/frame_generator_capturer.cc b/webrtc/test/frame_generator_capturer.cc index b991414fc2..70e2c85698 100644 --- a/webrtc/test/frame_generator_capturer.cc +++ b/webrtc/test/frame_generator_capturer.cc @@ -12,10 +12,10 @@ #include "webrtc/base/criticalsection.h" #include "webrtc/test/frame_generator.h" -#include "webrtc/system_wrappers/interface/clock.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/sleep.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/include/clock.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/sleep.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" #include "webrtc/video_send_stream.h" namespace webrtc { diff --git a/webrtc/test/histogram.cc b/webrtc/test/histogram.cc index 0e6e9b2c02..6fcdb6864f 100644 --- a/webrtc/test/histogram.cc +++ b/webrtc/test/histogram.cc @@ -14,10 +14,10 @@ #include "webrtc/base/criticalsection.h" #include "webrtc/base/thread_annotations.h" -#include "webrtc/system_wrappers/interface/metrics.h" +#include "webrtc/system_wrappers/include/metrics.h" // Test implementation of histogram methods in -// webrtc/system_wrappers/interface/metrics.h. +// webrtc/system_wrappers/include/metrics.h. namespace webrtc { namespace { diff --git a/webrtc/test/testsupport/fileutils.cc b/webrtc/test/testsupport/fileutils.cc index c29e502433..15abf5c517 100644 --- a/webrtc/test/testsupport/fileutils.cc +++ b/webrtc/test/testsupport/fileutils.cc @@ -18,7 +18,7 @@ #include #include -#include "webrtc/system_wrappers/interface/utf_util_win.h" +#include "webrtc/system_wrappers/include/utf_util_win.h" #define GET_CURRENT_DIR _getcwd #else #include diff --git a/webrtc/test/testsupport/trace_to_stderr.h b/webrtc/test/testsupport/trace_to_stderr.h index 88f1811740..a713b798c5 100644 --- a/webrtc/test/testsupport/trace_to_stderr.h +++ b/webrtc/test/testsupport/trace_to_stderr.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_TEST_TEST_SUPPORT_TRACE_TO_STDERR_H_ #define WEBRTC_TEST_TEST_SUPPORT_TRACE_TO_STDERR_H_ -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { namespace test { diff --git a/webrtc/tools/agc/agc_harness.cc b/webrtc/tools/agc/agc_harness.cc index 5fea1f70b1..73e1e09935 100644 --- a/webrtc/tools/agc/agc_harness.cc +++ b/webrtc/tools/agc/agc_harness.cc @@ -13,8 +13,8 @@ #include "gflags/gflags.h" #include "webrtc/base/checks.h" #include "webrtc/base/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/sleep.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/sleep.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/channel_transport/include/channel_transport.h" #include "webrtc/test/testsupport/trace_to_stderr.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc index c57b8a1c02..e86f560cfd 100644 --- a/webrtc/video/end_to_end_tests.cc +++ b/webrtc/video/end_to_end_tests.cc @@ -25,10 +25,10 @@ #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" #include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/metrics.h" -#include "webrtc/system_wrappers/interface/sleep.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/metrics.h" +#include "webrtc/system_wrappers/include/sleep.h" #include "webrtc/test/call_test.h" #include "webrtc/test/direct_transport.h" #include "webrtc/test/encoder_settings.h" diff --git a/webrtc/video/rampup_tests.cc b/webrtc/video/rampup_tests.cc index d0ce8a11dd..70efe3b9ed 100644 --- a/webrtc/video/rampup_tests.cc +++ b/webrtc/video/rampup_tests.cc @@ -21,8 +21,8 @@ #include "webrtc/modules/rtp_rtcp/interface/rtp_payload_registry.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" #include "webrtc/test/testsupport/perf_test.h" #include "webrtc/video/rampup_tests.h" diff --git a/webrtc/video/rampup_tests.h b/webrtc/video/rampup_tests.h index 9a046568de..ff65c8d0a0 100644 --- a/webrtc/video/rampup_tests.h +++ b/webrtc/video/rampup_tests.h @@ -19,7 +19,7 @@ #include "webrtc/call.h" #include "webrtc/call/transport_adapter.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/test/call_test.h" namespace webrtc { diff --git a/webrtc/video/receive_statistics_proxy.cc b/webrtc/video/receive_statistics_proxy.cc index 5b456a817f..eec2bc8301 100644 --- a/webrtc/video/receive_statistics_proxy.cc +++ b/webrtc/video/receive_statistics_proxy.cc @@ -14,9 +14,9 @@ #include "webrtc/base/checks.h" #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" -#include "webrtc/system_wrappers/interface/clock.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/metrics.h" +#include "webrtc/system_wrappers/include/clock.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/metrics.h" namespace webrtc { diff --git a/webrtc/video/replay.cc b/webrtc/video/replay.cc index 05d9df0877..f54909e55f 100644 --- a/webrtc/video/replay.cc +++ b/webrtc/video/replay.cc @@ -21,8 +21,8 @@ #include "webrtc/call.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h" -#include "webrtc/system_wrappers/interface/clock.h" -#include "webrtc/system_wrappers/interface/sleep.h" +#include "webrtc/system_wrappers/include/clock.h" +#include "webrtc/system_wrappers/include/sleep.h" #include "webrtc/test/encoder_settings.h" #include "webrtc/test/null_transport.h" #include "webrtc/test/fake_decoder.h" diff --git a/webrtc/video/send_statistics_proxy.cc b/webrtc/video/send_statistics_proxy.cc index 29df33cf97..5be9970583 100644 --- a/webrtc/video/send_statistics_proxy.cc +++ b/webrtc/video/send_statistics_proxy.cc @@ -16,8 +16,8 @@ #include "webrtc/base/checks.h" #include "webrtc/base/logging.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/metrics.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/metrics.h" namespace webrtc { namespace { diff --git a/webrtc/video/send_statistics_proxy.h b/webrtc/video/send_statistics_proxy.h index 7451bb57e8..26ea09c4c4 100644 --- a/webrtc/video/send_statistics_proxy.h +++ b/webrtc/video/send_statistics_proxy.h @@ -20,7 +20,7 @@ #include "webrtc/common_types.h" #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" #include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" #include "webrtc/video_engine/overuse_frame_detector.h" #include "webrtc/video_engine/vie_encoder.h" #include "webrtc/video_send_stream.h" diff --git a/webrtc/video/video_capture_input.cc b/webrtc/video/video_capture_input.cc index 7e63fd817f..42bc65f05f 100644 --- a/webrtc/video/video_capture_input.cc +++ b/webrtc/video/video_capture_input.cc @@ -18,10 +18,10 @@ #include "webrtc/modules/video_capture/include/video_capture_factory.h" #include "webrtc/modules/video_processing/main/interface/video_processing.h" #include "webrtc/modules/video_render/include/video_render_defines.h" -#include "webrtc/system_wrappers/interface/clock.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/clock.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/tick_util.h" #include "webrtc/video/send_statistics_proxy.h" #include "webrtc/video_engine/overuse_frame_detector.h" #include "webrtc/video_engine/vie_encoder.h" diff --git a/webrtc/video/video_capture_input.h b/webrtc/video/video_capture_input.h index 12482969bd..5a86ad265f 100644 --- a/webrtc/video/video_capture_input.h +++ b/webrtc/video/video_capture_input.h @@ -22,8 +22,8 @@ #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" #include "webrtc/modules/video_coding/main/interface/video_coding.h" #include "webrtc/modules/video_processing/main/interface/video_processing.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" #include "webrtc/typedefs.h" #include "webrtc/video_engine/vie_defines.h" #include "webrtc/video_send_stream.h" diff --git a/webrtc/video/video_capture_input_unittest.cc b/webrtc/video/video_capture_input_unittest.cc index 2c9e0bada5..e8bc2ad1c9 100644 --- a/webrtc/video/video_capture_input_unittest.cc +++ b/webrtc/video/video_capture_input_unittest.cc @@ -16,10 +16,10 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/common.h" #include "webrtc/modules/utility/interface/mock/mock_process_thread.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/ref_count.h" -#include "webrtc/system_wrappers/interface/scoped_vector.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/ref_count.h" +#include "webrtc/system_wrappers/include/scoped_vector.h" #include "webrtc/test/fake_texture_frame.h" #include "webrtc/video/send_statistics_proxy.h" diff --git a/webrtc/video/video_quality_test.cc b/webrtc/video/video_quality_test.cc index a475c9ff9c..3e4bbdbbd5 100644 --- a/webrtc/video/video_quality_test.cc +++ b/webrtc/video/video_quality_test.cc @@ -22,7 +22,7 @@ #include "webrtc/call.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h" -#include "webrtc/system_wrappers/interface/cpu_info.h" +#include "webrtc/system_wrappers/include/cpu_info.h" #include "webrtc/test/layer_filtering_transport.h" #include "webrtc/test/run_loop.h" #include "webrtc/test/statistics.h" diff --git a/webrtc/video/video_receive_stream.cc b/webrtc/video/video_receive_stream.cc index 09a383cac6..f5cb357098 100644 --- a/webrtc/video/video_receive_stream.cc +++ b/webrtc/video/video_receive_stream.cc @@ -18,7 +18,7 @@ #include "webrtc/base/logging.h" #include "webrtc/call/congestion_controller.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" #include "webrtc/video/receive_statistics_proxy.h" #include "webrtc/video_engine/call_stats.h" #include "webrtc/video_receive_stream.h" diff --git a/webrtc/video/video_receive_stream.h b/webrtc/video/video_receive_stream.h index f86f76d763..7b1f5394f1 100644 --- a/webrtc/video/video_receive_stream.h +++ b/webrtc/video/video_receive_stream.h @@ -19,7 +19,7 @@ #include "webrtc/common_video/interface/incoming_video_stream.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/video_render/include/video_render_defines.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" #include "webrtc/video/encoded_frame_callback_adapter.h" #include "webrtc/video/receive_statistics_proxy.h" #include "webrtc/video_encoder.h" diff --git a/webrtc/video/video_send_stream.h b/webrtc/video/video_send_stream.h index d94b25a1e6..88c1611915 100644 --- a/webrtc/video/video_send_stream.h +++ b/webrtc/video/video_send_stream.h @@ -18,7 +18,7 @@ #include "webrtc/call/transport_adapter.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/video/encoded_frame_callback_adapter.h" #include "webrtc/video/send_statistics_proxy.h" #include "webrtc/video/video_capture_input.h" diff --git a/webrtc/video/video_send_stream_tests.cc b/webrtc/video/video_send_stream_tests.cc index 92e3b73179..d2e4d6582a 100644 --- a/webrtc/video/video_send_stream_tests.cc +++ b/webrtc/video/video_send_stream_tests.cc @@ -26,11 +26,11 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h" #include "webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h" #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/ref_count.h" -#include "webrtc/system_wrappers/interface/sleep.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/ref_count.h" +#include "webrtc/system_wrappers/include/sleep.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" #include "webrtc/test/call_test.h" #include "webrtc/test/configurable_frame_size_encoder.h" #include "webrtc/test/fake_texture_frame.h" diff --git a/webrtc/video_engine/call_stats.cc b/webrtc/video_engine/call_stats.cc index c5e890d8a7..0b71cc346c 100644 --- a/webrtc/video_engine/call_stats.cc +++ b/webrtc/video_engine/call_stats.cc @@ -13,8 +13,8 @@ #include #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/tick_util.h" namespace webrtc { namespace { diff --git a/webrtc/video_engine/call_stats_unittest.cc b/webrtc/video_engine/call_stats_unittest.cc index bfe52da5e7..4fb88df338 100644 --- a/webrtc/video_engine/call_stats_unittest.cc +++ b/webrtc/video_engine/call_stats_unittest.cc @@ -13,7 +13,7 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/tick_util.h" #include "webrtc/video_engine/call_stats.h" using ::testing::_; diff --git a/webrtc/video_engine/encoder_state_feedback.cc b/webrtc/video_engine/encoder_state_feedback.cc index 4d744acd0a..1c376b2820 100644 --- a/webrtc/video_engine/encoder_state_feedback.cc +++ b/webrtc/video_engine/encoder_state_feedback.cc @@ -14,7 +14,7 @@ #include "webrtc/base/checks.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/video_engine/vie_encoder.h" namespace webrtc { diff --git a/webrtc/video_engine/overuse_frame_detector.cc b/webrtc/video_engine/overuse_frame_detector.cc index b0c82d9ec1..47a6e496b9 100644 --- a/webrtc/video_engine/overuse_frame_detector.cc +++ b/webrtc/video_engine/overuse_frame_detector.cc @@ -20,7 +20,7 @@ #include "webrtc/base/checks.h" #include "webrtc/base/exp_filter.h" #include "webrtc/base/logging.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/video_engine/overuse_frame_detector_unittest.cc b/webrtc/video_engine/overuse_frame_detector_unittest.cc index 931554899d..d502f02204 100644 --- a/webrtc/video_engine/overuse_frame_detector_unittest.cc +++ b/webrtc/video_engine/overuse_frame_detector_unittest.cc @@ -14,7 +14,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/base/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" namespace webrtc { namespace { diff --git a/webrtc/video_engine/payload_router.cc b/webrtc/video_engine/payload_router.cc index 958cdd869c..3af3d4829e 100644 --- a/webrtc/video_engine/payload_router.cc +++ b/webrtc/video_engine/payload_router.cc @@ -13,7 +13,7 @@ #include "webrtc/base/checks.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" namespace webrtc { diff --git a/webrtc/video_engine/payload_router.h b/webrtc/video_engine/payload_router.h index 0d6a1ac6dd..17bc279290 100644 --- a/webrtc/video_engine/payload_router.h +++ b/webrtc/video_engine/payload_router.h @@ -18,7 +18,7 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/base/thread_annotations.h" #include "webrtc/common_types.h" -#include "webrtc/system_wrappers/interface/atomic32.h" +#include "webrtc/system_wrappers/include/atomic32.h" namespace webrtc { diff --git a/webrtc/video_engine/stream_synchronization.h b/webrtc/video_engine/stream_synchronization.h index c1ad42e13f..1209062f9b 100644 --- a/webrtc/video_engine/stream_synchronization.h +++ b/webrtc/video_engine/stream_synchronization.h @@ -13,7 +13,7 @@ #include -#include "webrtc/system_wrappers/interface/rtp_to_ntp.h" +#include "webrtc/system_wrappers/include/rtp_to_ntp.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/video_engine/vie_channel.cc b/webrtc/video_engine/vie_channel.cc index e375319b81..147ecb1456 100644 --- a/webrtc/video_engine/vie_channel.cc +++ b/webrtc/video_engine/vie_channel.cc @@ -27,9 +27,9 @@ #include "webrtc/modules/video_coding/main/interface/video_coding.h" #include "webrtc/modules/video_processing/main/interface/video_processing.h" #include "webrtc/modules/video_render/include/video_render_defines.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/metrics.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/metrics.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" #include "webrtc/video/receive_statistics_proxy.h" #include "webrtc/video_engine/call_stats.h" #include "webrtc/video_engine/payload_router.h" diff --git a/webrtc/video_engine/vie_channel.h b/webrtc/video_engine/vie_channel.h index 3e95cb1885..41c679aafa 100644 --- a/webrtc/video_engine/vie_channel.h +++ b/webrtc/video_engine/vie_channel.h @@ -19,8 +19,8 @@ #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" #include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/tick_util.h" #include "webrtc/typedefs.h" #include "webrtc/video_engine/vie_defines.h" #include "webrtc/video_engine/vie_receiver.h" diff --git a/webrtc/video_engine/vie_encoder.cc b/webrtc/video_engine/vie_encoder.cc index 21da5f926a..f705bc26c2 100644 --- a/webrtc/video_engine/vie_encoder.cc +++ b/webrtc/video_engine/vie_encoder.cc @@ -27,10 +27,10 @@ #include "webrtc/modules/video_coding/main/interface/video_coding.h" #include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" #include "webrtc/modules/video_coding/main/source/encoded_frame.h" -#include "webrtc/system_wrappers/interface/clock.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/metrics.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/clock.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/metrics.h" +#include "webrtc/system_wrappers/include/tick_util.h" #include "webrtc/video/send_statistics_proxy.h" #include "webrtc/video_engine/payload_router.h" #include "webrtc/video_engine/vie_defines.h" diff --git a/webrtc/video_engine/vie_receiver.cc b/webrtc/video_engine/vie_receiver.cc index d757f93726..2e3b588302 100644 --- a/webrtc/video_engine/vie_receiver.cc +++ b/webrtc/video_engine/vie_receiver.cc @@ -23,11 +23,11 @@ #include "webrtc/modules/rtp_rtcp/interface/rtp_receiver.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h" #include "webrtc/modules/video_coding/main/interface/video_coding.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/metrics.h" -#include "webrtc/system_wrappers/interface/tick_util.h" -#include "webrtc/system_wrappers/interface/timestamp_extrapolator.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/metrics.h" +#include "webrtc/system_wrappers/include/tick_util.h" +#include "webrtc/system_wrappers/include/timestamp_extrapolator.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { diff --git a/webrtc/video_engine/vie_remb.cc b/webrtc/video_engine/vie_remb.cc index 2cf794c5d4..b347f2ee00 100644 --- a/webrtc/video_engine/vie_remb.cc +++ b/webrtc/video_engine/vie_remb.cc @@ -16,9 +16,9 @@ #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h" #include "webrtc/modules/utility/interface/process_thread.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/tick_util.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/tick_util.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { diff --git a/webrtc/video_engine/vie_remb_unittest.cc b/webrtc/video_engine/vie_remb_unittest.cc index 3949d4482c..3289c4b822 100644 --- a/webrtc/video_engine/vie_remb_unittest.cc +++ b/webrtc/video_engine/vie_remb_unittest.cc @@ -20,7 +20,7 @@ #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h" #include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h" #include "webrtc/modules/utility/interface/mock/mock_process_thread.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/tick_util.h" #include "webrtc/video_engine/vie_remb.h" using ::testing::_; diff --git a/webrtc/video_engine/vie_sync_module.cc b/webrtc/video_engine/vie_sync_module.cc index a7266c918c..1c5d877cd2 100644 --- a/webrtc/video_engine/vie_sync_module.cc +++ b/webrtc/video_engine/vie_sync_module.cc @@ -15,7 +15,7 @@ #include "webrtc/modules/rtp_rtcp/interface/rtp_receiver.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h" #include "webrtc/modules/video_coding/main/interface/video_coding.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/video_engine/stream_synchronization.h" #include "webrtc/voice_engine/include/voe_video_sync.h" diff --git a/webrtc/video_engine/vie_sync_module.h b/webrtc/video_engine/vie_sync_module.h index 106b6e01a5..ea2ae0bd51 100644 --- a/webrtc/video_engine/vie_sync_module.h +++ b/webrtc/video_engine/vie_sync_module.h @@ -16,7 +16,7 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/modules/interface/module.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/tick_util.h" #include "webrtc/video_engine/stream_synchronization.h" #include "webrtc/voice_engine/include/voe_video_sync.h" diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc index cd35468400..013f908d34 100644 --- a/webrtc/voice_engine/channel.cc +++ b/webrtc/voice_engine/channel.cc @@ -26,9 +26,9 @@ #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h" #include "webrtc/modules/utility/interface/audio_frame_operations.h" #include "webrtc/modules/utility/interface/process_thread.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/logging.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/logging.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/voice_engine/include/voe_base.h" #include "webrtc/voice_engine/include/voe_external_media.h" #include "webrtc/voice_engine/include/voe_rtp_rtcp.h" diff --git a/webrtc/voice_engine/channel_manager.h b/webrtc/voice_engine/channel_manager.h index 81768e010f..4c0cede483 100644 --- a/webrtc/voice_engine/channel_manager.h +++ b/webrtc/voice_engine/channel_manager.h @@ -16,8 +16,8 @@ #include "webrtc/base/constructormagic.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/call/rtc_event_log.h" -#include "webrtc/system_wrappers/interface/atomic32.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/atomic32.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/voice_engine/dtmf_inband.cc b/webrtc/voice_engine/dtmf_inband.cc index 7ae24db22d..309bd54609 100644 --- a/webrtc/voice_engine/dtmf_inband.cc +++ b/webrtc/voice_engine/dtmf_inband.cc @@ -12,8 +12,8 @@ #include -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { diff --git a/webrtc/voice_engine/dtmf_inband_queue.cc b/webrtc/voice_engine/dtmf_inband_queue.cc index 86e8d62b72..8619a73ed8 100644 --- a/webrtc/voice_engine/dtmf_inband_queue.cc +++ b/webrtc/voice_engine/dtmf_inband_queue.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/voice_engine/dtmf_inband_queue.h" namespace webrtc { diff --git a/webrtc/voice_engine/dtmf_inband_queue.h b/webrtc/voice_engine/dtmf_inband_queue.h index 5ca3f9c5f4..e3b9ce3adc 100644 --- a/webrtc/voice_engine/dtmf_inband_queue.h +++ b/webrtc/voice_engine/dtmf_inband_queue.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_VOICE_ENGINE_DTMF_INBAND_QUEUE_H #define WEBRTC_VOICE_ENGINE_DTMF_INBAND_QUEUE_H -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/typedefs.h" #include "webrtc/voice_engine/voice_engine_defines.h" diff --git a/webrtc/voice_engine/level_indicator.cc b/webrtc/voice_engine/level_indicator.cc index 61dfbcda87..059b15f927 100644 --- a/webrtc/voice_engine/level_indicator.cc +++ b/webrtc/voice_engine/level_indicator.cc @@ -10,7 +10,7 @@ #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/modules/interface/module_common_types.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/voice_engine/level_indicator.h" namespace webrtc { diff --git a/webrtc/voice_engine/monitor_module.cc b/webrtc/voice_engine/monitor_module.cc index ca358022a5..5ea73571d8 100644 --- a/webrtc/voice_engine/monitor_module.cc +++ b/webrtc/voice_engine/monitor_module.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/tick_util.h" #include "webrtc/voice_engine/monitor_module.h" namespace webrtc { diff --git a/webrtc/voice_engine/network_predictor.h b/webrtc/voice_engine/network_predictor.h index 0e5068659c..b35ccd8756 100644 --- a/webrtc/voice_engine/network_predictor.h +++ b/webrtc/voice_engine/network_predictor.h @@ -12,7 +12,7 @@ #define WEBRTC_VOICE_ENGINE_NETWORK_PREDICTOR_H_ #include "webrtc/base/exp_filter.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/voice_engine/network_predictor_unittest.cc b/webrtc/voice_engine/network_predictor_unittest.cc index 55ee20da03..28ff57fb49 100644 --- a/webrtc/voice_engine/network_predictor_unittest.cc +++ b/webrtc/voice_engine/network_predictor_unittest.cc @@ -12,7 +12,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/voice_engine/network_predictor.h" -#include "webrtc/system_wrappers/interface/clock.h" +#include "webrtc/system_wrappers/include/clock.h" namespace webrtc { namespace voe { diff --git a/webrtc/voice_engine/output_mixer.cc b/webrtc/voice_engine/output_mixer.cc index 2dc8bf2b26..31b429c498 100644 --- a/webrtc/voice_engine/output_mixer.cc +++ b/webrtc/voice_engine/output_mixer.cc @@ -12,9 +12,9 @@ #include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/modules/utility/interface/audio_frame_operations.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/file_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/file_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/voice_engine/include/voe_external_media.h" #include "webrtc/voice_engine/statistics.h" #include "webrtc/voice_engine/utility.h" diff --git a/webrtc/voice_engine/shared_data.cc b/webrtc/voice_engine/shared_data.cc index a37b1677bc..4bc5b3cf2b 100644 --- a/webrtc/voice_engine/shared_data.cc +++ b/webrtc/voice_engine/shared_data.cc @@ -11,8 +11,8 @@ #include "webrtc/voice_engine/shared_data.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/voice_engine/channel.h" #include "webrtc/voice_engine/output_mixer.h" #include "webrtc/voice_engine/transmit_mixer.h" diff --git a/webrtc/voice_engine/statistics.cc b/webrtc/voice_engine/statistics.cc index 4717fd1391..3787e67122 100644 --- a/webrtc/voice_engine/statistics.cc +++ b/webrtc/voice_engine/statistics.cc @@ -13,8 +13,8 @@ #include "webrtc/voice_engine/statistics.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" namespace webrtc { diff --git a/webrtc/voice_engine/test/android/android_test/jni/android_test.cc b/webrtc/voice_engine/test/android/android_test/jni/android_test.cc index ef52439237..ceafca9da3 100644 --- a/webrtc/voice_engine/test/android/android_test/jni/android_test.cc +++ b/webrtc/voice_engine/test/android/android_test/jni/android_test.cc @@ -15,7 +15,7 @@ #include "webrtc/voice_engine/test/android/android_test/jni/org_webrtc_voiceengine_test_AndroidTest.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" #include "webrtc/voice_engine/include/voe_audio_processing.h" #include "webrtc/voice_engine/include/voe_base.h" diff --git a/webrtc/voice_engine/test/auto_test/fakes/conference_transport.cc b/webrtc/voice_engine/test/auto_test/fakes/conference_transport.cc index 0677093959..28ab352608 100644 --- a/webrtc/voice_engine/test/auto_test/fakes/conference_transport.cc +++ b/webrtc/voice_engine/test/auto_test/fakes/conference_transport.cc @@ -14,7 +14,7 @@ #include "webrtc/base/byteorder.h" #include "webrtc/base/timeutils.h" -#include "webrtc/system_wrappers/interface/sleep.h" +#include "webrtc/system_wrappers/include/sleep.h" namespace { static const unsigned int kReflectorSsrc = 0x0000; diff --git a/webrtc/voice_engine/test/auto_test/fakes/conference_transport.h b/webrtc/voice_engine/test/auto_test/fakes/conference_transport.h index 2194de9280..7b45e6d3e1 100644 --- a/webrtc/voice_engine/test/auto_test/fakes/conference_transport.h +++ b/webrtc/voice_engine/test/auto_test/fakes/conference_transport.h @@ -20,9 +20,9 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/common_types.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" #include "webrtc/voice_engine/include/voe_base.h" #include "webrtc/voice_engine/include/voe_codec.h" #include "webrtc/voice_engine/include/voe_file.h" diff --git a/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h b/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h index c3bd9e8eb2..1a1075c585 100644 --- a/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h +++ b/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h @@ -16,11 +16,11 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/common_types.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" -#include "webrtc/system_wrappers/interface/atomic32.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/sleep.h" -#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/include/atomic32.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/sleep.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" #include "webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h" class TestErrorObserver; diff --git a/webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.cc b/webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.cc index 408ebf959d..fc28bcdebb 100644 --- a/webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.cc +++ b/webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.cc @@ -10,7 +10,7 @@ #include "webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h" -#include "webrtc/system_wrappers/interface/sleep.h" +#include "webrtc/system_wrappers/include/sleep.h" BeforeInitializationFixture::BeforeInitializationFixture() : voice_engine_(webrtc::VoiceEngine::Create()) { diff --git a/webrtc/voice_engine/test/auto_test/standard/mixing_test.cc b/webrtc/voice_engine/test/auto_test/standard/mixing_test.cc index 3c61956a1a..b7f7d560d7 100644 --- a/webrtc/voice_engine/test/auto_test/standard/mixing_test.cc +++ b/webrtc/voice_engine/test/auto_test/standard/mixing_test.cc @@ -11,7 +11,7 @@ #include #include -#include "webrtc/system_wrappers/interface/sleep.h" +#include "webrtc/system_wrappers/include/sleep.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h" diff --git a/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_extensions.cc b/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_extensions.cc index bc6ce56cb4..780a7f7ba9 100644 --- a/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_extensions.cc +++ b/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_extensions.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h" -#include "webrtc/system_wrappers/interface/atomic32.h" -#include "webrtc/system_wrappers/interface/sleep.h" +#include "webrtc/system_wrappers/include/atomic32.h" +#include "webrtc/system_wrappers/include/sleep.h" #include "webrtc/voice_engine/test/auto_test/fixtures/before_streaming_fixture.h" using ::testing::_; diff --git a/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc b/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc index 9574646f80..14dca27d1c 100644 --- a/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc +++ b/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/interface/atomic32.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" +#include "webrtc/system_wrappers/include/atomic32.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" #include "webrtc/voice_engine/test/auto_test/voe_standard_test.h" diff --git a/webrtc/voice_engine/test/auto_test/voe_conference_test.cc b/webrtc/voice_engine/test/auto_test/voe_conference_test.cc index f9d227188b..c70d92a946 100644 --- a/webrtc/voice_engine/test/auto_test/voe_conference_test.cc +++ b/webrtc/voice_engine/test/auto_test/voe_conference_test.cc @@ -13,7 +13,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/base/format_macros.h" #include "webrtc/base/timeutils.h" -#include "webrtc/system_wrappers/interface/sleep.h" +#include "webrtc/system_wrappers/include/sleep.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/voice_engine/test/auto_test/fakes/conference_transport.h" diff --git a/webrtc/voice_engine/test/auto_test/voe_standard_test.cc b/webrtc/voice_engine/test/auto_test/voe_standard_test.cc index d3fd478a52..22eee15bf0 100644 --- a/webrtc/voice_engine/test/auto_test/voe_standard_test.cc +++ b/webrtc/voice_engine/test/auto_test/voe_standard_test.cc @@ -15,7 +15,7 @@ #include #include "webrtc/engine_configurations.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/voice_engine/include/voe_neteq_stats.h" #include "webrtc/voice_engine/test/auto_test/automated_mode.h" #include "webrtc/voice_engine/test/auto_test/voe_cpu_test.h" diff --git a/webrtc/voice_engine/test/auto_test/voe_stress_test.cc b/webrtc/voice_engine/test/auto_test/voe_stress_test.cc index ab8fffe832..960276b699 100644 --- a/webrtc/voice_engine/test/auto_test/voe_stress_test.cc +++ b/webrtc/voice_engine/test/auto_test/voe_stress_test.cc @@ -25,7 +25,7 @@ #include "webrtc/voice_engine/test/auto_test/voe_stress_test.h" #include "webrtc/base/scoped_ptr.h" -#include "webrtc/system_wrappers/interface/sleep.h" +#include "webrtc/system_wrappers/include/sleep.h" #include "webrtc/test/channel_transport/include/channel_transport.h" #include "webrtc/voice_engine/test/auto_test/voe_standard_test.h" #include "webrtc/voice_engine/test/auto_test/voe_test_defines.h" diff --git a/webrtc/voice_engine/test/auto_test/voe_stress_test.h b/webrtc/voice_engine/test/auto_test/voe_stress_test.h index 7128b238ff..69b3a92bb3 100644 --- a/webrtc/voice_engine/test/auto_test/voe_stress_test.h +++ b/webrtc/voice_engine/test/auto_test/voe_stress_test.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_VOICE_ENGINE_VOE_STRESS_TEST_H #define WEBRTC_VOICE_ENGINE_VOE_STRESS_TEST_H -#include "webrtc/system_wrappers/interface/thread_wrapper.h" +#include "webrtc/system_wrappers/include/thread_wrapper.h" namespace voetest { // TODO(andrew): using directives are not permitted. diff --git a/webrtc/voice_engine/transmit_mixer.cc b/webrtc/voice_engine/transmit_mixer.cc index 5e62939d54..94592cf616 100644 --- a/webrtc/voice_engine/transmit_mixer.cc +++ b/webrtc/voice_engine/transmit_mixer.cc @@ -12,10 +12,10 @@ #include "webrtc/base/format_macros.h" #include "webrtc/modules/utility/interface/audio_frame_operations.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/event_wrapper.h" -#include "webrtc/system_wrappers/interface/logging.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/event_wrapper.h" +#include "webrtc/system_wrappers/include/logging.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/voice_engine/channel.h" #include "webrtc/voice_engine/channel_manager.h" #include "webrtc/voice_engine/include/voe_external_media.h" diff --git a/webrtc/voice_engine/utility.cc b/webrtc/voice_engine/utility.cc index 498620acaf..7bc7e0e963 100644 --- a/webrtc/voice_engine/utility.cc +++ b/webrtc/voice_engine/utility.cc @@ -15,7 +15,7 @@ #include "webrtc/common_types.h" #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/modules/utility/interface/audio_frame_operations.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/logging.h" #include "webrtc/voice_engine/voice_engine_defines.h" namespace webrtc { diff --git a/webrtc/voice_engine/voe_audio_processing_impl.cc b/webrtc/voice_engine/voe_audio_processing_impl.cc index bbc3f0d3ca..83f70fe68e 100644 --- a/webrtc/voice_engine/voe_audio_processing_impl.cc +++ b/webrtc/voice_engine/voe_audio_processing_impl.cc @@ -11,9 +11,9 @@ #include "webrtc/voice_engine/voe_audio_processing_impl.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/logging.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/logging.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/voice_engine/channel.h" #include "webrtc/voice_engine/include/voe_errors.h" #include "webrtc/voice_engine/transmit_mixer.h" diff --git a/webrtc/voice_engine/voe_base_impl.cc b/webrtc/voice_engine/voe_base_impl.cc index 14e90524f7..16ed43f022 100644 --- a/webrtc/voice_engine/voe_base_impl.cc +++ b/webrtc/voice_engine/voe_base_impl.cc @@ -16,9 +16,9 @@ #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h" #include "webrtc/modules/audio_device/audio_device_impl.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/file_wrapper.h" -#include "webrtc/system_wrappers/interface/logging.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/file_wrapper.h" +#include "webrtc/system_wrappers/include/logging.h" #include "webrtc/voice_engine/channel.h" #include "webrtc/voice_engine/include/voe_errors.h" #include "webrtc/voice_engine/output_mixer.h" diff --git a/webrtc/voice_engine/voe_codec_impl.cc b/webrtc/voice_engine/voe_codec_impl.cc index 2bbc78ad3b..e656508d47 100644 --- a/webrtc/voice_engine/voe_codec_impl.cc +++ b/webrtc/voice_engine/voe_codec_impl.cc @@ -11,8 +11,8 @@ #include "webrtc/voice_engine/voe_codec_impl.h" #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/voice_engine/channel.h" #include "webrtc/voice_engine/include/voe_errors.h" #include "webrtc/voice_engine/voice_engine_impl.h" diff --git a/webrtc/voice_engine/voe_dtmf_impl.cc b/webrtc/voice_engine/voe_dtmf_impl.cc index f9e5a7c0ae..cf6ab1dd7b 100644 --- a/webrtc/voice_engine/voe_dtmf_impl.cc +++ b/webrtc/voice_engine/voe_dtmf_impl.cc @@ -10,8 +10,8 @@ #include "webrtc/voice_engine/voe_dtmf_impl.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/voice_engine/channel.h" #include "webrtc/voice_engine/include/voe_errors.h" #include "webrtc/voice_engine/output_mixer.h" diff --git a/webrtc/voice_engine/voe_external_media_impl.cc b/webrtc/voice_engine/voe_external_media_impl.cc index df42df4c8e..ccb12b9743 100644 --- a/webrtc/voice_engine/voe_external_media_impl.cc +++ b/webrtc/voice_engine/voe_external_media_impl.cc @@ -10,8 +10,8 @@ #include "webrtc/voice_engine/voe_external_media_impl.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/voice_engine/channel.h" #include "webrtc/voice_engine/include/voe_errors.h" #include "webrtc/voice_engine/output_mixer.h" diff --git a/webrtc/voice_engine/voe_file_impl.cc b/webrtc/voice_engine/voe_file_impl.cc index f24127b33c..7927f9ff05 100644 --- a/webrtc/voice_engine/voe_file_impl.cc +++ b/webrtc/voice_engine/voe_file_impl.cc @@ -11,9 +11,9 @@ #include "webrtc/voice_engine/voe_file_impl.h" #include "webrtc/modules/media_file/interface/media_file.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/file_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/file_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/voice_engine/channel.h" #include "webrtc/voice_engine/include/voe_errors.h" #include "webrtc/voice_engine/output_mixer.h" diff --git a/webrtc/voice_engine/voe_hardware_impl.cc b/webrtc/voice_engine/voe_hardware_impl.cc index 9acbb5d9b3..30eb418ac9 100644 --- a/webrtc/voice_engine/voe_hardware_impl.cc +++ b/webrtc/voice_engine/voe_hardware_impl.cc @@ -12,8 +12,8 @@ #include -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/voice_engine/include/voe_errors.h" #include "webrtc/voice_engine/voice_engine_impl.h" diff --git a/webrtc/voice_engine/voe_neteq_stats_impl.cc b/webrtc/voice_engine/voe_neteq_stats_impl.cc index 0118fd07fa..a30620d961 100644 --- a/webrtc/voice_engine/voe_neteq_stats_impl.cc +++ b/webrtc/voice_engine/voe_neteq_stats_impl.cc @@ -11,8 +11,8 @@ #include "webrtc/voice_engine/voe_neteq_stats_impl.h" #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/voice_engine/channel.h" #include "webrtc/voice_engine/include/voe_errors.h" #include "webrtc/voice_engine/voice_engine_impl.h" diff --git a/webrtc/voice_engine/voe_network_impl.cc b/webrtc/voice_engine/voe_network_impl.cc index 2ff6b6a811..4a0c3f7861 100644 --- a/webrtc/voice_engine/voe_network_impl.cc +++ b/webrtc/voice_engine/voe_network_impl.cc @@ -12,9 +12,9 @@ #include "webrtc/base/checks.h" #include "webrtc/base/format_macros.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/logging.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/logging.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/voice_engine/channel.h" #include "webrtc/voice_engine/include/voe_errors.h" #include "webrtc/voice_engine/voice_engine_impl.h" diff --git a/webrtc/voice_engine/voe_rtp_rtcp_impl.cc b/webrtc/voice_engine/voe_rtp_rtcp_impl.cc index 9fd38ef416..008445c6f5 100644 --- a/webrtc/voice_engine/voe_rtp_rtcp_impl.cc +++ b/webrtc/voice_engine/voe_rtp_rtcp_impl.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/file_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/file_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/voice_engine/include/voe_errors.h" #include "webrtc/voice_engine/voe_rtp_rtcp_impl.h" #include "webrtc/voice_engine/voice_engine_impl.h" diff --git a/webrtc/voice_engine/voe_video_sync_impl.cc b/webrtc/voice_engine/voe_video_sync_impl.cc index 4dea6fa169..811bb4ec5e 100644 --- a/webrtc/voice_engine/voe_video_sync_impl.cc +++ b/webrtc/voice_engine/voe_video_sync_impl.cc @@ -10,8 +10,8 @@ #include "webrtc/voice_engine/voe_video_sync_impl.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/voice_engine/channel.h" #include "webrtc/voice_engine/include/voe_errors.h" #include "webrtc/voice_engine/voice_engine_impl.h" diff --git a/webrtc/voice_engine/voe_volume_control_impl.cc b/webrtc/voice_engine/voe_volume_control_impl.cc index d0f3de1e05..bb57ed7cd0 100644 --- a/webrtc/voice_engine/voe_volume_control_impl.cc +++ b/webrtc/voice_engine/voe_volume_control_impl.cc @@ -10,8 +10,8 @@ #include "webrtc/voice_engine/voe_volume_control_impl.h" -#include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/critical_section_wrapper.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/voice_engine/channel.h" #include "webrtc/voice_engine/include/voe_errors.h" #include "webrtc/voice_engine/output_mixer.h" diff --git a/webrtc/voice_engine/voice_engine_impl.cc b/webrtc/voice_engine/voice_engine_impl.cc index f7f363debe..246ee8ec9c 100644 --- a/webrtc/voice_engine/voice_engine_impl.cc +++ b/webrtc/voice_engine/voice_engine_impl.cc @@ -16,7 +16,7 @@ #endif #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h" -#include "webrtc/system_wrappers/interface/trace.h" +#include "webrtc/system_wrappers/include/trace.h" #include "webrtc/voice_engine/voice_engine_impl.h" namespace webrtc { diff --git a/webrtc/voice_engine/voice_engine_impl.h b/webrtc/voice_engine/voice_engine_impl.h index 21039943fd..c3b2e5ced9 100644 --- a/webrtc/voice_engine/voice_engine_impl.h +++ b/webrtc/voice_engine/voice_engine_impl.h @@ -12,7 +12,7 @@ #define WEBRTC_VOICE_ENGINE_VOICE_ENGINE_IMPL_H #include "webrtc/engine_configurations.h" -#include "webrtc/system_wrappers/interface/atomic32.h" +#include "webrtc/system_wrappers/include/atomic32.h" #include "webrtc/voice_engine/voe_base_impl.h" #ifdef WEBRTC_VOICE_ENGINE_AUDIO_PROCESSING_API