From 77eab704707e03c74eda3126b92e4ef5e2b7eb4d Mon Sep 17 00:00:00 2001 From: kwiberg Date: Wed, 28 Sep 2016 17:42:01 -0700 Subject: [PATCH] Enable the -Wundef warning for clang NOPRESUBMIT=true BUG=webrtc:6398 Review-Url: https://codereview.webrtc.org/2358993004 Cr-Commit-Position: refs/heads/master@{#14425} --- webrtc/BUILD.gn | 1 + webrtc/DEPS | 1 - webrtc/api/mediastream_unittest.cc | 4 +-- .../api/peerconnectioninterface_unittest.cc | 2 +- webrtc/api/proxy_unittest.cc | 2 +- webrtc/api/rtpsenderreceiver_unittest.cc | 4 +-- webrtc/api/statscollector_unittest.cc | 4 +-- webrtc/api/test/androidtestinitializer.cc | 4 +++ webrtc/api/test/mock_datachannel.h | 2 +- webrtc/api/test/mock_peerconnection.h | 2 +- webrtc/api/test/mock_webrtcsession.h | 2 +- webrtc/audio/audio_receive_stream_unittest.cc | 2 +- webrtc/audio/audio_send_stream_unittest.cc | 2 +- webrtc/audio/audio_state_unittest.cc | 2 +- webrtc/base/BUILD.gn | 1 + webrtc/base/base.gyp | 1 + webrtc/base/basictypes.h | 2 +- webrtc/base/bitbuffer_unittest.cc | 2 +- webrtc/base/common.cc | 4 +-- webrtc/base/criticalsection.h | 2 ++ webrtc/base/event.cc | 4 +-- webrtc/base/event_tracer_unittest.cc | 2 +- webrtc/base/gunit.h | 2 +- webrtc/base/httpclient.h | 2 +- webrtc/base/httpcommon.cc | 2 +- webrtc/base/ignore_wundef.h | 33 +++++++++++++++++++ webrtc/base/logging.cc | 2 +- webrtc/base/logging.h | 2 +- webrtc/base/mod_ops_unittest.cc | 2 +- webrtc/base/pathutils.cc | 2 +- webrtc/base/platform_thread_unittest.cc | 2 +- webrtc/base/proxydetect.cc | 8 +++-- webrtc/base/random_unittest.cc | 2 +- webrtc/base/rate_limiter_unittest.cc | 2 +- webrtc/base/rate_statistics_unittest.cc | 2 +- .../base/sequenced_task_checker_unittest.cc | 8 ++--- webrtc/base/swap_queue_unittest.cc | 2 +- webrtc/base/thread_checker_unittest.cc | 2 +- webrtc/call/bitrate_allocator_unittest.cc | 4 +-- webrtc/call/bitrate_estimator_tests.cc | 2 +- webrtc/call/call_perf_tests.cc | 2 +- webrtc/call/call_unittest.cc | 2 +- webrtc/call/mock/mock_rtc_event_log.h | 2 +- webrtc/call/packet_injection_tests.cc | 2 +- webrtc/call/rampup_tests.cc | 2 +- webrtc/call/ringbuffer_unittest.cc | 2 +- webrtc/call/rtc_event_log_helper_thread.h | 3 ++ webrtc/call/rtc_event_log_parser.h | 3 ++ webrtc/call/rtc_event_log_unittest.cc | 2 +- webrtc/call/rtc_event_log_unittest_helper.cc | 2 +- .../common_audio/audio_converter_unittest.cc | 2 +- .../audio_ring_buffer_unittest.cc | 2 +- webrtc/common_audio/audio_util_unittest.cc | 4 +-- webrtc/common_audio/blocker_unittest.cc | 2 +- .../common_audio/channel_buffer_unittest.cc | 2 +- webrtc/common_audio/fir_filter_unittest.cc | 2 +- .../common_audio/lapped_transform_unittest.cc | 2 +- webrtc/common_audio/real_fourier_unittest.cc | 2 +- .../resampler/push_resampler_unittest.cc | 2 +- .../resampler/push_sinc_resampler_unittest.cc | 4 +-- .../resampler/resampler_unittest.cc | 2 +- .../resampler/sinc_resampler_unittest.cc | 4 +-- webrtc/common_audio/ring_buffer_unittest.cc | 2 +- .../signal_processing/real_fft_unittest.cc | 2 +- .../signal_processing_unittest.cc | 2 +- .../sparse_fir_filter_unittest.cc | 2 +- webrtc/common_audio/vad/mock/mock_vad.h | 2 +- webrtc/common_audio/vad/vad_core_unittest.cc | 2 +- .../vad/vad_filterbank_unittest.cc | 2 +- webrtc/common_audio/vad/vad_gmm_unittest.cc | 2 +- webrtc/common_audio/vad/vad_sp_unittest.cc | 2 +- webrtc/common_audio/vad/vad_unittest.cc | 2 +- webrtc/common_audio/vad/vad_unittest.h | 2 +- webrtc/common_audio/wav_file_unittest.cc | 2 +- webrtc/common_audio/wav_header_unittest.cc | 2 +- .../common_audio/window_generator_unittest.cc | 2 +- webrtc/common_types.h | 4 +-- .../common_video/bitrate_adjuster_unittest.cc | 2 +- .../common_video/h264/pps_parser_unittest.cc | 2 +- .../common_video/h264/sps_parser_unittest.cc | 2 +- .../h264/sps_vui_rewriter_unittest.cc | 2 +- .../common_video/i420_buffer_pool_unittest.cc | 2 +- .../common_video/i420_video_frame_unittest.cc | 2 +- webrtc/common_video/libyuv/libyuv_unittest.cc | 2 +- .../third_party/SocketRocket/SRWebSocket.m | 2 +- webrtc/media/base/test/mock_mediachannel.h | 2 +- .../engine/nullwebrtcvideoengine_unittest.cc | 2 +- .../engine/payload_type_mapper_unittest.cc | 2 +- webrtc/media/engine/simulcast_unittest.cc | 2 +- .../engine/webrtcmediaengine_unittest.cc | 2 +- .../acm2/acm_receive_test_oldapi.cc | 2 +- .../acm2/acm_receiver_unittest_oldapi.cc | 2 +- .../audio_coding/acm2/acm_send_test_oldapi.cc | 2 +- .../audio_coding_module_unittest_oldapi.cc | 2 +- .../acm2/call_statistics_unittest.cc | 2 +- .../acm2/codec_manager_unittest.cc | 2 +- .../acm2/rent_a_codec_unittest.cc | 2 +- .../audio_network_adaptor_impl_unittest.cc | 2 +- .../bitrate_controller_unittest.cc | 2 +- .../channel_controller_unittest.cc | 2 +- .../controller_manager_unittest.cc | 2 +- .../debug_dump_writer.cc | 3 ++ .../dtx_controller_unittest.cc | 2 +- .../fec_controller_unittest.cc | 2 +- .../frame_length_controller_unittest.cc | 2 +- .../mock/mock_controller.h | 2 +- .../mock/mock_controller_manager.h | 2 +- .../mock/mock_debug_dump_writer.h | 2 +- .../mock/mock_smoothing_filter.h | 2 +- .../smoothing_filter_unittest.cc | 2 +- .../codecs/audio_decoder_factory_unittest.cc | 2 +- .../codecs/cng/audio_encoder_cng_unittest.cc | 2 +- .../audio_coding/codecs/cng/cng_unittest.cc | 2 +- .../audio_coding/codecs/ilbc/ilbc_unittest.cc | 2 +- .../isac/fix/source/filterbanks_unittest.cc | 2 +- .../isac/fix/source/filters_unittest.cc | 2 +- .../fix/source/lpc_masking_model_unittest.cc | 2 +- .../isac/fix/source/transform_unittest.cc | 2 +- .../source/audio_encoder_isac_unittest.cc | 2 +- .../codecs/isac/main/source/isac_unittest.cc | 2 +- .../audio_coding/codecs/isac/unittest.cc | 2 +- .../legacy_encoded_audio_frame_unittest.cc | 2 +- .../codecs/mock/mock_audio_decoder_factory.h | 2 +- .../codecs/mock/mock_audio_encoder.h | 2 +- .../opus/audio_encoder_opus_unittest.cc | 2 +- .../audio_coding/codecs/opus/opus_fec_test.cc | 2 +- .../audio_coding/codecs/opus/opus_inst.h | 4 +++ .../audio_coding/codecs/opus/opus_unittest.cc | 2 +- .../red/audio_encoder_copy_red_unittest.cc | 2 +- .../codecs/tools/audio_codec_speed_test.cc | 2 +- .../codecs/tools/audio_codec_speed_test.h | 2 +- .../audio_coding/neteq/audio_classifier.h | 4 +++ .../neteq/audio_classifier_unittest.cc | 2 +- .../neteq/audio_decoder_unittest.cc | 2 +- .../neteq/audio_multi_vector_unittest.cc | 2 +- .../neteq/audio_vector_unittest.cc | 2 +- .../neteq/background_noise_unittest.cc | 2 +- .../neteq/buffer_level_filter_unittest.cc | 2 +- .../neteq/comfort_noise_unittest.cc | 2 +- .../neteq/decision_logic_unittest.cc | 2 +- .../neteq/decoder_database_unittest.cc | 4 +-- .../neteq/delay_manager_unittest.cc | 4 +-- .../neteq/delay_peak_detector_unittest.cc | 2 +- .../audio_coding/neteq/dsp_helper_unittest.cc | 2 +- .../neteq/dtmf_buffer_unittest.cc | 2 +- .../neteq/dtmf_tone_generator_unittest.cc | 2 +- .../audio_coding/neteq/expand_unittest.cc | 2 +- .../audio_coding/neteq/merge_unittest.cc | 2 +- .../neteq/mock/mock_audio_decoder.h | 2 +- .../neteq/mock/mock_buffer_level_filter.h | 2 +- .../neteq/mock/mock_decoder_database.h | 2 +- .../neteq/mock/mock_delay_manager.h | 2 +- .../neteq/mock/mock_delay_peak_detector.h | 2 +- .../neteq/mock/mock_dtmf_buffer.h | 2 +- .../neteq/mock/mock_dtmf_tone_generator.h | 2 +- .../audio_coding/neteq/mock/mock_expand.h | 2 +- .../neteq/mock/mock_external_decoder_pcm16b.h | 2 +- .../neteq/mock/mock_packet_buffer.h | 2 +- .../neteq/mock/mock_red_payload_splitter.h | 2 +- .../neteq/nack_tracker_unittest.cc | 2 +- .../neteq/neteq_external_decoder_unittest.cc | 2 +- .../audio_coding/neteq/neteq_impl_unittest.cc | 4 +-- .../neteq/neteq_network_stats_unittest.cc | 2 +- .../neteq/neteq_stereo_unittest.cc | 2 +- .../audio_coding/neteq/neteq_unittest.cc | 9 +++-- .../audio_coding/neteq/normal_unittest.cc | 2 +- .../neteq/packet_buffer_unittest.cc | 4 +-- .../neteq/post_decode_vad_unittest.cc | 2 +- .../neteq/random_vector_unittest.cc | 2 +- .../neteq/red_payload_splitter_unittest.cc | 2 +- .../neteq/sync_buffer_unittest.cc | 2 +- .../audio_coding/neteq/test/RTPjitter.cc | 2 +- .../audio_coding/neteq/test/RTPtimeshift.cc | 2 +- .../neteq/test/neteq_performance_unittest.cc | 2 +- .../audio_coding/neteq/tick_timer_unittest.cc | 4 +-- .../neteq/time_stretch_unittest.cc | 2 +- .../neteq/timestamp_scaler_unittest.cc | 4 +-- .../neteq/tools/input_audio_file_unittest.cc | 2 +- .../tools/neteq_external_decoder_test.cc | 2 +- .../neteq/tools/neteq_quality_test.h | 2 +- .../neteq/tools/packet_unittest.cc | 2 +- webrtc/modules/audio_coding/test/APITest.cc | 2 +- .../audio_coding/test/EncodeDecodeTest.cc | 2 +- webrtc/modules/audio_coding/test/PCMFile.cc | 2 +- .../audio_coding/test/PacketLossTest.cc | 2 +- webrtc/modules/audio_coding/test/RTPFile.cc | 2 +- .../audio_coding/test/TestAllCodecs.cc | 2 +- .../modules/audio_coding/test/TestStereo.cc | 2 +- webrtc/modules/audio_coding/test/Tester.cc | 2 +- .../audio_coding/test/TwoWayCommunication.cc | 2 +- .../modules/audio_coding/test/delay_test.cc | 2 +- webrtc/modules/audio_coding/test/iSACTest.cc | 4 +-- .../test/insert_packet_with_timing.cc | 2 +- webrtc/modules/audio_coding/test/opus_test.cc | 2 +- .../test/target_delay_unittest.cc | 2 +- webrtc/modules/audio_coding/test/utility.cc | 2 +- webrtc/modules/audio_coding/test/utility.h | 2 +- .../source/memory_pool.h | 2 +- .../test/audio_conference_mixer_unittest.cc | 2 +- .../android/audio_device_unittest.cc | 4 +-- .../android/audio_manager_unittest.cc | 2 +- .../android/ensure_initialized.cc | 4 +++ .../fine_audio_buffer_unittest.cc | 4 +-- .../audio_device/include/mock_audio_device.h | 2 +- .../audio_device/ios/audio_device_ios.mm | 3 +- .../ios/audio_device_unittest_ios.cc | 4 +-- .../ios/objc/RTCAudioSessionTest.mm | 2 +- .../audio_device/mock_audio_device_buffer.h | 2 +- .../test/audio_device_test_api.cc | 2 +- .../audio_mixer/test/audio_mixer_unittest.cc | 2 +- .../aec/echo_cancellation_unittest.cc | 2 +- .../aec/system_delay_unittest.cc | 2 +- .../agc/agc_manager_direct_unittest.cc | 4 +-- .../agc/loudness_histogram_unittest.cc | 2 +- .../modules/audio_processing/agc/mock_agc.h | 2 +- .../audio_processing/audio_buffer_unittest.cc | 2 +- .../audio_processing/audio_processing_impl.h | 3 ++ .../audio_processing_impl_locking_unittest.cc | 2 +- .../audio_processing_impl_unittest.cc | 4 +-- .../audio_processing_performance_unittest.cc | 2 +- .../audio_processing_unittest.cc | 7 ++-- .../beamformer/array_util_unittest.cc | 2 +- .../beamformer/complex_matrix_unittest.cc | 2 +- .../beamformer/covariance_matrix_generator.cc | 2 +- .../covariance_matrix_generator_unittest.cc | 2 +- .../beamformer/matrix_test_helpers.h | 2 +- .../beamformer/matrix_unittest.cc | 2 +- .../beamformer/mock_nonlinear_beamformer.h | 2 +- .../nonlinear_beamformer_unittest.cc | 2 +- .../audio_processing/config_unittest.cc | 2 +- .../echo_cancellation_bit_exact_unittest.cc | 2 +- .../echo_cancellation_impl_unittest.cc | 2 +- .../echo_control_mobile_unittest.cc | 2 +- .../audio_processing/gain_control_unittest.cc | 2 +- .../high_pass_filter_unittest.cc | 2 +- .../intelligibility_enhancer_unittest.cc | 2 +- .../intelligibility_utils_unittest.cc | 2 +- .../test/intelligibility_proc.cc | 2 +- .../level_controller_complexity_unittest.cc | 2 +- .../level_controller_unittest.cc | 2 +- .../level_estimator_unittest.cc | 2 +- .../noise_suppression_unittest.cc | 2 +- .../splitting_filter_unittest.cc | 2 +- .../test/aec_dump_based_simulator.h | 3 ++ .../test/bitexactness_tools.h | 2 +- .../test/debug_dump_replayer.h | 6 +++- .../audio_processing/test/debug_dump_test.cc | 2 +- .../audio_processing/test/process_test.cc | 7 ++-- .../audio_processing/test/protobuf_utils.h | 4 +++ .../modules/audio_processing/test/unpack.cc | 6 +++- .../transient/dyadic_decimator_unittest.cc | 2 +- .../transient/file_utils_unittest.cc | 2 +- .../transient/moving_moments_unittest.cc | 2 +- .../transient/transient_detector_unittest.cc | 2 +- .../transient/transient_suppression_test.cc | 2 +- .../transient_suppressor_unittest.cc | 2 +- .../transient/wpd_node_unittest.cc | 2 +- .../transient/wpd_tree_unittest.cc | 2 +- .../utility/block_mean_calculator_unittest.cc | 2 +- .../utility/delay_estimator_unittest.cc | 2 +- .../audio_processing/vad/gmm_unittest.cc | 2 +- .../vad/pitch_based_vad_unittest.cc | 2 +- .../vad/pitch_internal_unittest.cc | 2 +- .../vad/pole_zero_filter_unittest.cc | 2 +- .../vad/standalone_vad_unittest.cc | 2 +- .../vad/vad_audio_proc_unittest.cc | 2 +- .../vad/vad_circular_buffer_unittest.cc | 2 +- .../vad/voice_activity_detector_unittest.cc | 2 +- .../voice_detection_unittest.cc | 2 +- .../bitrate_controller_unittest.cc | 2 +- .../include/mock/mock_bitrate_controller.h | 2 +- ...send_side_bandwidth_estimation_unittest.cc | 2 +- .../congestion_controller_unittest.cc | 4 +-- .../delay_based_bwe_unittest.cc | 2 +- .../delay_based_bwe_unittest_helper.h | 2 +- .../include/mock/mock_congestion_controller.h | 2 +- .../probe_bitrate_estimator_unittest.cc | 4 +-- .../probe_controller_unittest.cc | 4 +-- .../desktop_and_cursor_composer_unittest.cc | 2 +- .../desktop_region_unittest.cc | 2 +- .../desktop_capture/differ_block_unittest.cc | 2 +- .../mouse_cursor_monitor_unittest.cc | 2 +- .../desktop_capture/rgba_color_unittest.cc | 2 +- ...screen_capturer_differ_wrapper_unittest.cc | 2 +- .../screen_capturer_helper_unittest.cc | 2 +- .../screen_capturer_mac_unittest.cc | 2 +- .../screen_capturer_mock_objects.h | 2 +- .../screen_capturer_unittest.cc | 4 +-- .../desktop_capture/screen_drawer_unittest.cc | 2 +- .../desktop_capture/win/cursor_unittest.cc | 2 +- .../window_capturer_unittest.cc | 2 +- .../modules/media_file/media_file_unittest.cc | 2 +- .../modules/module_common_types_unittest.cc | 2 +- .../modules/pacing/bitrate_prober_unittest.cc | 2 +- .../modules/pacing/mock/mock_paced_sender.h | 2 +- .../modules/pacing/paced_sender_unittest.cc | 4 +-- .../modules/pacing/packet_router_unittest.cc | 4 +-- .../bwe_simulations.cc | 2 +- .../mock/mock_remote_bitrate_estimator.h | 2 +- .../mock/mock_remote_bitrate_observer.h | 2 +- .../inter_arrival_unittest.cc | 2 +- .../overuse_detector_unittest.cc | 2 +- ...remote_bitrate_estimator_unittest_helper.h | 2 +- .../remote_estimator_proxy_unittest.cc | 4 +-- .../send_time_history_unittest.cc | 2 +- .../remote_bitrate_estimator/test/bwe_test.h | 2 +- .../test/bwe_test_framework_unittest.cc | 2 +- .../test/bwe_unittest.cc | 2 +- .../test/estimators/nada_unittest.cc | 2 +- .../test/estimators/remb.cc | 2 +- .../test/estimators/tcp.cc | 2 +- .../test/metric_recorder_unittest.cc | 2 +- .../test/packet_receiver.cc | 2 +- .../transport_feedback_adapter_unittest.cc | 4 +-- webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h | 2 +- .../rtp_rtcp/source/byte_io_unittest.cc | 2 +- .../rtp_rtcp/source/fec_receiver_unittest.cc | 4 +-- .../source/mock/mock_rtp_payload_strategy.h | 2 +- .../rtp_rtcp/source/nack_rtx_unittest.cc | 2 +- .../source/packet_loss_stats_unittest.cc | 2 +- .../source/playout_delay_oracle_unittest.cc | 2 +- .../rtp_rtcp/source/producer_fec_unittest.cc | 2 +- .../source/receive_statistics_unittest.cc | 4 +-- .../remote_ntp_time_estimator_unittest.cc | 4 +-- .../source/rtcp_packet/app_unittest.cc | 4 +-- .../source/rtcp_packet/bye_unittest.cc | 4 +-- .../rtcp_packet/common_header_unittest.cc | 2 +- .../rtcp_packet/compound_packet_unittest.cc | 2 +- .../source/rtcp_packet/dlrr_unittest.cc | 2 +- .../extended_jitter_report_unittest.cc | 4 +-- .../rtcp_packet/extended_reports_unittest.cc | 4 +-- .../source/rtcp_packet/fir_unittest.cc | 4 +-- .../source/rtcp_packet/nack_unittest.cc | 4 +-- .../source/rtcp_packet/pli_unittest.cc | 4 +-- .../rapid_resync_request_unittest.cc | 4 +-- .../rtcp_packet/receiver_report_unittest.cc | 4 +-- .../source/rtcp_packet/remb_unittest.cc | 4 +-- .../rtcp_packet/report_block_unittest.cc | 2 +- .../source/rtcp_packet/rpsi_unittest.cc | 4 +-- .../source/rtcp_packet/rrtr_unittest.cc | 2 +- .../source/rtcp_packet/sdes_unittest.cc | 2 +- .../rtcp_packet/sender_report_unittest.cc | 4 +-- .../source/rtcp_packet/sli_unittest.cc | 4 +-- .../source/rtcp_packet/tmmbn_unittest.cc | 4 +-- .../source/rtcp_packet/tmmbr_unittest.cc | 4 +-- .../transport_feedback_unittest.cc | 2 +- .../rtcp_packet/voip_metric_unittest.cc | 2 +- .../rtp_rtcp/source/rtcp_packet_unittest.cc | 4 +-- .../rtp_rtcp/source/rtcp_receiver_unittest.cc | 4 +-- .../rtp_rtcp/source/rtcp_sender_unittest.cc | 4 +-- .../rtp_rtcp/source/rtcp_utility_unittest.cc | 2 +- .../rtp_rtcp/source/rtp_fec_unittest.cc | 2 +- .../source/rtp_format_h264_unittest.cc | 4 +-- .../source/rtp_format_vp8_test_helper.cc | 2 +- .../source/rtp_format_vp8_unittest.cc | 4 +-- .../source/rtp_format_vp9_unittest.cc | 4 +-- .../source/rtp_header_extension_unittest.cc | 2 +- .../source/rtp_packet_history_unittest.cc | 2 +- .../rtp_rtcp/source/rtp_packet_unittest.cc | 4 +-- .../source/rtp_payload_registry_unittest.cc | 4 +-- .../rtp_rtcp/source/rtp_rtcp_impl_unittest.cc | 4 +-- .../rtp_rtcp/source/rtp_sender_unittest.cc | 4 +-- .../rtp_rtcp/source/time_util_unittest.cc | 2 +- .../ulpfec_header_reader_writer_unittest.cc | 2 +- .../vp8_partition_aggregator_unittest.cc | 2 +- .../modules/rtp_rtcp/test/testAPI/test_api.h | 2 +- .../rtp_rtcp/test/testAPI/test_api_audio.cc | 2 +- .../rtp_rtcp/test/testAPI/test_api_rtcp.cc | 4 +-- .../rtp_rtcp/test/testAPI/test_api_video.cc | 2 +- .../modules/rtp_rtcp/test/testFec/test_fec.cc | 2 +- .../test/testFec/test_packet_masks_metrics.cc | 2 +- .../include/mock/mock_process_thread.h | 2 +- .../source/audio_frame_operations_unittest.cc | 2 +- .../utility/source/file_player_unittests.cc | 2 +- webrtc/modules/utility/source/helpers_ios.mm | 3 +- .../source/process_thread_impl_unittest.cc | 4 +-- .../objc/rtc_video_capture_objc.mm | 3 +- .../test/video_capture_main_mac.mm | 2 +- .../test/video_capture_unittest.cc | 6 ++-- .../h264/h264_video_toolbox_nalu_unittest.cc | 2 +- .../video_coding/codecs/h264/include/h264.h | 4 +-- .../mock/mock_video_codec_interface.h | 2 +- .../test/mock/mock_packet_manipulator.h | 2 +- .../test/packet_manipulator_unittest.cc | 2 +- .../codecs/test/stats_unittest.cc | 2 +- .../test/videoprocessor_integrationtest.cc | 2 +- .../codecs/test/videoprocessor_unittest.cc | 4 +-- .../vp8/default_temporal_layers_unittest.cc | 2 +- .../reference_picture_selection_unittest.cc | 2 +- .../codecs/vp8/screenshare_layers_unittest.cc | 2 +- .../vp8/simulcast_encoder_adapter_unittest.cc | 2 +- .../codecs/vp8/simulcast_unittest.h | 2 +- .../codecs/vp8/test/vp8_impl_unittest.cc | 2 +- .../codecs/vp8/vp8_sequence_coder.cc | 2 +- .../vp9/vp9_screenshare_layers_unittest.cc | 2 +- .../video_coding/decoding_state_unittest.cc | 2 +- .../video_coding/frame_buffer2_unittest.cc | 4 +-- .../video_coding/histogram_unittest.cc | 2 +- .../include/mock/mock_vcm_callbacks.h | 2 +- .../include/mock/mock_video_codec_interface.h | 2 +- .../video_coding/jitter_buffer_unittest.cc | 4 +-- .../video_coding/jitter_estimator_tests.cc | 2 +- .../video_coding/nack_module_unittest.cc | 2 +- .../percentile_filter_unittest.cc | 2 +- .../protection_bitrate_calculator_unittest.cc | 2 +- .../modules/video_coding/receiver_unittest.cc | 2 +- .../rtp_frame_reference_finder_unittest.cc | 2 +- .../sequence_number_util_unittest.cc | 2 +- .../video_coding/session_info_unittest.cc | 2 +- .../video_coding/test/stream_generator.cc | 2 +- .../modules/video_coding/timing_unittest.cc | 2 +- .../utility/frame_dropper_unittest.cc | 2 +- .../utility/h264_bitstream_parser_unittest.cc | 2 +- .../utility/ivf_file_writer_unittest.cc | 2 +- .../utility/mock/mock_frame_dropper.h | 2 +- .../utility/moving_average_unittest.cc | 2 +- .../utility/quality_scaler_unittest.cc | 2 +- .../simulcast_rate_allocator_unittest.cc | 2 +- .../video_coding_robustness_unittest.cc | 4 +-- .../video_packet_buffer_unittest.cc | 2 +- .../video_coding/video_receiver_unittest.cc | 2 +- .../video_coding/video_sender_unittest.cc | 2 +- .../test/video_processing_unittest.h | 2 +- .../Classes/avfoundationvideocapturer.mm | 6 ++-- .../source/aligned_array_unittest.cc | 2 +- .../system_wrappers/source/aligned_malloc.cc | 2 +- .../source/aligned_malloc_unittest.cc | 4 +-- .../system_wrappers/source/clock_unittest.cc | 2 +- .../source/condition_variable_unittest.cc | 2 +- .../source/critical_section_unittest.cc | 2 +- .../source/data_log_helpers_unittest.cc | 2 +- .../source/data_log_unittest.cc | 2 +- .../source/data_log_unittest_disabled.cc | 2 +- .../source/event_timer_posix_unittest.cc | 2 +- .../source/logging_unittest.cc | 2 +- .../source/metrics_default_unittest.cc | 2 +- .../source/metrics_unittest.cc | 2 +- .../source/ntp_time_unittest.cc | 2 +- .../source/rtp_to_ntp_unittest.cc | 2 +- .../source/stl_util_unittest.cc | 2 +- .../source/stringize_macros_unittest.cc | 2 +- webrtc/test/BUILD.gn | 3 ++ webrtc/test/DEPS | 9 +++++ .../test/configurable_frame_size_encoder.cc | 2 +- webrtc/test/direct_transport.cc | 2 +- webrtc/test/fake_audio_device.cc | 2 +- webrtc/test/fake_decoder.cc | 2 +- webrtc/test/fake_encoder.cc | 2 +- webrtc/test/fake_network_pipe_unittest.cc | 4 +-- webrtc/test/frame_generator_unittest.cc | 2 +- webrtc/test/gmock.h | 20 +++++++++++ webrtc/test/gtest.h | 27 +++++++++++++++ webrtc/test/mock_transport.h | 2 +- webrtc/test/mock_voe_channel_proxy.h | 2 +- webrtc/test/mock_voice_engine.h | 2 +- webrtc/test/rtp_file_reader_unittest.cc | 2 +- webrtc/test/rtp_file_writer_unittest.cc | 2 +- webrtc/test/rtp_rtcp_observer.h | 2 +- webrtc/test/test.gyp | 3 ++ webrtc/test/test_main.cc | 2 +- webrtc/test/test_suite.cc | 4 +-- .../testsupport/always_passing_unittest.cc | 2 +- webrtc/test/testsupport/fileutils_unittest.cc | 2 +- .../test/testsupport/frame_reader_unittest.cc | 2 +- .../test/testsupport/frame_writer_unittest.cc | 2 +- .../metrics/video_metrics_unittest.cc | 2 +- .../test/testsupport/mock/mock_frame_reader.h | 2 +- .../test/testsupport/mock/mock_frame_writer.h | 2 +- .../testsupport/packet_reader_unittest.cc | 2 +- webrtc/test/testsupport/perf_test_unittest.cc | 2 +- webrtc/tools/agc/activity_metric.cc | 2 +- .../event_log_visualizer/plot_protobuf.h | 3 ++ .../video_quality_analysis_unittest.cc | 2 +- .../frame_editing/frame_editing_unittest.cc | 2 +- .../simple_command_line_parser_unittest.cc | 2 +- webrtc/video/call_stats_unittest.cc | 4 +-- .../video/encoder_state_feedback_unittest.cc | 4 +-- webrtc/video/end_to_end_tests.cc | 2 +- webrtc/video/full_stack.cc | 2 +- .../video/overuse_frame_detector_unittest.cc | 4 +-- webrtc/video/payload_router_unittest.cc | 4 +-- webrtc/video/replay.cc | 2 +- webrtc/video/report_block_stats_unittest.cc | 2 +- webrtc/video/screenshare_loopback.cc | 2 +- webrtc/video/send_delay_stats_unittest.cc | 2 +- .../video/send_statistics_proxy_unittest.cc | 2 +- webrtc/video/stats_counter_unittest.cc | 2 +- .../video/stream_synchronization_unittest.cc | 2 +- webrtc/video/video_decoder_unittest.cc | 2 +- webrtc/video/video_encoder_unittest.cc | 2 +- webrtc/video/video_loopback.cc | 2 +- webrtc/video/video_quality_test.cc | 2 +- webrtc/video/video_send_stream_tests.cc | 2 +- webrtc/video/vie_encoder_unittest.cc | 2 +- webrtc/video/vie_remb_unittest.cc | 4 +-- webrtc/voice_engine/channel_unittest.cc | 2 +- webrtc/voice_engine/mock/mock_voe_observer.h | 2 +- .../network_predictor_unittest.cc | 2 +- .../test/auto_test/automated_mode.cc | 2 +- .../auto_test/fakes/conference_transport.h | 2 +- .../fixtures/before_initialization_fixture.h | 4 +-- .../test/auto_test/voe_conference_test.cc | 2 +- .../test/auto_test/voe_output_test.cc | 2 +- .../channel_transport/channel_transport.cc | 2 +- .../udp_socket_manager_unittest.cc | 2 +- .../udp_socket_wrapper_unittest.cc | 4 +-- .../udp_transport_unittest.cc | 4 +-- .../test/cmd_test/voe_cmd_test.cc | 2 +- .../voice_engine/transmit_mixer_unittest.cc | 2 +- webrtc/voice_engine/utility_unittest.cc | 2 +- .../voe_audio_processing_unittest.cc | 2 +- webrtc/voice_engine/voe_base_unittest.cc | 2 +- webrtc/voice_engine/voe_codec_unittest.cc | 2 +- webrtc/voice_engine/voe_network_unittest.cc | 2 +- webrtc/voice_engine/voice_engine_fixture.h | 2 +- 515 files changed, 744 insertions(+), 581 deletions(-) create mode 100644 webrtc/base/ignore_wundef.h create mode 100644 webrtc/test/gmock.h create mode 100644 webrtc/test/gtest.h diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn index bd6288b2a8..4eeba6aa84 100644 --- a/webrtc/BUILD.gn +++ b/webrtc/BUILD.gn @@ -179,6 +179,7 @@ config("common_config") { "-Wimplicit-fallthrough", "-Wthread-safety", "-Winconsistent-missing-override", + "-Wundef", ] } } diff --git a/webrtc/DEPS b/webrtc/DEPS index ffb67d17f5..27b0eecea4 100644 --- a/webrtc/DEPS +++ b/webrtc/DEPS @@ -7,7 +7,6 @@ include_rules = [ "+external/webrtc/webrtc", # Android platform build. "+gflags", "+libyuv", - "+testing", "-webrtc", # Has to be disabled; otherwise all dirs below will be allowed. # Individual headers that will be moved out of here, see webrtc:4243. "+webrtc/call.h", diff --git a/webrtc/api/mediastream_unittest.cc b/webrtc/api/mediastream_unittest.cc index 1881cceeb0..b5f783f30e 100644 --- a/webrtc/api/mediastream_unittest.cc +++ b/webrtc/api/mediastream_unittest.cc @@ -14,8 +14,8 @@ #include "webrtc/api/mediastream.h" #include "webrtc/api/videotrack.h" #include "webrtc/api/test/fakevideotracksource.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/gunit.h" #include "webrtc/base/refcount.h" diff --git a/webrtc/api/peerconnectioninterface_unittest.cc b/webrtc/api/peerconnectioninterface_unittest.cc index d9c8af0b4c..c639f98b4f 100644 --- a/webrtc/api/peerconnectioninterface_unittest.cc +++ b/webrtc/api/peerconnectioninterface_unittest.cc @@ -12,7 +12,7 @@ #include #include -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/api/audiotrack.h" #include "webrtc/api/jsepsessiondescription.h" #include "webrtc/api/mediastream.h" diff --git a/webrtc/api/proxy_unittest.cc b/webrtc/api/proxy_unittest.cc index 005d0622ce..8c16513fac 100644 --- a/webrtc/api/proxy_unittest.cc +++ b/webrtc/api/proxy_unittest.cc @@ -13,7 +13,7 @@ #include #include -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/base/gunit.h" #include "webrtc/base/refcount.h" #include "webrtc/base/thread.h" diff --git a/webrtc/api/rtpsenderreceiver_unittest.cc b/webrtc/api/rtpsenderreceiver_unittest.cc index 8c91e148be..ea0bd646b0 100644 --- a/webrtc/api/rtpsenderreceiver_unittest.cc +++ b/webrtc/api/rtpsenderreceiver_unittest.cc @@ -12,8 +12,8 @@ #include #include -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/api/audiotrack.h" #include "webrtc/api/fakemediacontroller.h" #include "webrtc/api/localaudiosource.h" diff --git a/webrtc/api/statscollector_unittest.cc b/webrtc/api/statscollector_unittest.cc index b2fb93cb70..f5270fd6a7 100644 --- a/webrtc/api/statscollector_unittest.cc +++ b/webrtc/api/statscollector_unittest.cc @@ -15,8 +15,8 @@ #include "webrtc/api/statscollector.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/api/mediastream.h" #include "webrtc/api/mediastreaminterface.h" #include "webrtc/api/mediastreamtrack.h" diff --git a/webrtc/api/test/androidtestinitializer.cc b/webrtc/api/test/androidtestinitializer.cc index 6791810d94..2d18ae5857 100644 --- a/webrtc/api/test/androidtestinitializer.cc +++ b/webrtc/api/test/androidtestinitializer.cc @@ -12,12 +12,16 @@ #include +#include "webrtc/base/ignore_wundef.h" + // Note: this dependency is dangerous since it reaches into Chromium's base. // There's a risk of e.g. macro clashes. This file may only be used in tests. // Since we use Chromes build system for creating the gtest binary, this should // be fine. +RTC_PUSH_IGNORING_WUNDEF() #include "base/android/context_utils.h" #include "base/android/jni_android.h" +RTC_POP_IGNORING_WUNDEF() #include "webrtc/api/android/jni/classreferenceholder.h" #include "webrtc/api/android/jni/jni_helpers.h" diff --git a/webrtc/api/test/mock_datachannel.h b/webrtc/api/test/mock_datachannel.h index 5828e4c343..a09964e852 100644 --- a/webrtc/api/test/mock_datachannel.h +++ b/webrtc/api/test/mock_datachannel.h @@ -12,7 +12,7 @@ #define WEBRTC_API_TEST_MOCK_DATACHANNEL_H_ #include "webrtc/api/datachannel.h" -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" namespace webrtc { diff --git a/webrtc/api/test/mock_peerconnection.h b/webrtc/api/test/mock_peerconnection.h index 21b24a932e..50e66185d4 100644 --- a/webrtc/api/test/mock_peerconnection.h +++ b/webrtc/api/test/mock_peerconnection.h @@ -14,7 +14,7 @@ #include #include "webrtc/api/peerconnection.h" -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" namespace webrtc { diff --git a/webrtc/api/test/mock_webrtcsession.h b/webrtc/api/test/mock_webrtcsession.h index 459e3490db..108bdcaac0 100644 --- a/webrtc/api/test/mock_webrtcsession.h +++ b/webrtc/api/test/mock_webrtcsession.h @@ -15,7 +15,7 @@ #include #include "webrtc/api/webrtcsession.h" -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" namespace webrtc { diff --git a/webrtc/audio/audio_receive_stream_unittest.cc b/webrtc/audio/audio_receive_stream_unittest.cc index 9276c28312..77b529e76d 100644 --- a/webrtc/audio/audio_receive_stream_unittest.cc +++ b/webrtc/audio/audio_receive_stream_unittest.cc @@ -11,7 +11,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/audio/audio_receive_stream.h" #include "webrtc/audio/conversion.h" diff --git a/webrtc/audio/audio_send_stream_unittest.cc b/webrtc/audio/audio_send_stream_unittest.cc index ebac828079..c7eb24c436 100644 --- a/webrtc/audio/audio_send_stream_unittest.cc +++ b/webrtc/audio/audio_send_stream_unittest.cc @@ -11,7 +11,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/audio/audio_send_stream.h" #include "webrtc/audio/audio_state.h" diff --git a/webrtc/audio/audio_state_unittest.cc b/webrtc/audio/audio_state_unittest.cc index b0e2bc4c03..882766f515 100644 --- a/webrtc/audio/audio_state_unittest.cc +++ b/webrtc/audio/audio_state_unittest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/audio/audio_state.h" #include "webrtc/test/mock_voice_engine.h" diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn index f5dd4df9d6..72564148a7 100644 --- a/webrtc/base/BUILD.gn +++ b/webrtc/base/BUILD.gn @@ -117,6 +117,7 @@ rtc_static_library("rtc_base_approved") { "file.h", "format_macros.h", "function_view.h", + "ignore_wundef.h", "location.cc", "location.h", "md5.cc", diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp index c2f5d319fd..0e923a308a 100644 --- a/webrtc/base/base.gyp +++ b/webrtc/base/base.gyp @@ -59,6 +59,7 @@ 'file.h', 'format_macros.h', 'function_view.h', + 'ignore_wundef.h', 'location.h', 'location.cc', 'md5.cc', diff --git a/webrtc/base/basictypes.h b/webrtc/base/basictypes.h index 6ca09d0e0a..87dcdc6d11 100644 --- a/webrtc/base/basictypes.h +++ b/webrtc/base/basictypes.h @@ -31,7 +31,7 @@ #if !defined(RTC_ARCH_CPU_BIG_ENDIAN) && !defined(RTC_ARCH_CPU_LITTLE_ENDIAN) // x86, arm or GCC provided __BYTE_ORDER__ macros -#if CPU_X86 || CPU_ARM || \ +#if defined(CPU_X86) || defined(CPU_ARM) || \ (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) #define RTC_ARCH_CPU_LITTLE_ENDIAN #elif defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ diff --git a/webrtc/base/bitbuffer_unittest.cc b/webrtc/base/bitbuffer_unittest.cc index 7ba9c738bb..b06bf49095 100644 --- a/webrtc/base/bitbuffer_unittest.cc +++ b/webrtc/base/bitbuffer_unittest.cc @@ -168,7 +168,7 @@ TEST(BitBufferTest, SetOffsetValues) { // Disable death test on Android because it relies on fork() and doesn't play // nicely. -#if defined(GTEST_HAS_DEATH_TEST) +#if GTEST_HAS_DEATH_TEST #if !defined(WEBRTC_ANDROID) // Passing a NULL out parameter is death. EXPECT_DEATH(buffer.GetCurrentOffset(&byte_offset, NULL), ""); diff --git a/webrtc/base/common.cc b/webrtc/base/common.cc index c6f1b75312..07eb0b1c33 100644 --- a/webrtc/base/common.cc +++ b/webrtc/base/common.cc @@ -13,7 +13,7 @@ #include #include -#if WEBRTC_WIN +#ifdef WEBRTC_WIN #define WIN32_LEAN_AND_MEAN #include #endif // WEBRTC_WIN @@ -33,7 +33,7 @@ namespace rtc { void Break() { -#if WEBRTC_WIN +#ifdef WEBRTC_WIN ::DebugBreak(); #else // !WEBRTC_WIN // On POSIX systems, SIGTRAP signals debuggers to break without killing the diff --git a/webrtc/base/criticalsection.h b/webrtc/base/criticalsection.h index 217627eefd..bf77e2b78b 100644 --- a/webrtc/base/criticalsection.h +++ b/webrtc/base/criticalsection.h @@ -39,6 +39,8 @@ #if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)) #define CS_DEBUG_CHECKS 1 +#else +#define CS_DEBUG_CHECKS 0 #endif #if CS_DEBUG_CHECKS diff --git a/webrtc/base/event.cc b/webrtc/base/event.cc index 0e267dc1ac..4b348f63a1 100644 --- a/webrtc/base/event.cc +++ b/webrtc/base/event.cc @@ -86,7 +86,7 @@ bool Event::Wait(int milliseconds) { // Converting from seconds and microseconds (1e-6) plus // milliseconds (1e-3) to seconds and nanoseconds (1e-9). -#if HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE +#ifdef HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE // Use relative time version, which tends to be more efficient for // pthread implementations where provided (like on Android). ts.tv_sec = milliseconds / 1000; @@ -109,7 +109,7 @@ bool Event::Wait(int milliseconds) { pthread_mutex_lock(&event_mutex_); if (milliseconds != kForever) { while (!event_status_ && error == 0) { -#if HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE +#ifdef HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE error = pthread_cond_timedwait_relative_np( &event_cond_, &event_mutex_, &ts); #else diff --git a/webrtc/base/event_tracer_unittest.cc b/webrtc/base/event_tracer_unittest.cc index c1b86f2fd8..6ea127526b 100644 --- a/webrtc/base/event_tracer_unittest.cc +++ b/webrtc/base/event_tracer_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/base/event_tracer.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/trace_event.h" #include "webrtc/system_wrappers/include/static_instance.h" diff --git a/webrtc/base/gunit.h b/webrtc/base/gunit.h index c3e853458c..d49872db19 100644 --- a/webrtc/base/gunit.h +++ b/webrtc/base/gunit.h @@ -15,7 +15,7 @@ #include "webrtc/base/logging.h" #include "webrtc/base/thread.h" #if defined(GTEST_RELATIVE_PATH) -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #else #include "testing/base/public/gunit.h" #endif diff --git a/webrtc/base/httpclient.h b/webrtc/base/httpclient.h index 0c19d2efb4..569ff04ed8 100644 --- a/webrtc/base/httpclient.h +++ b/webrtc/base/httpclient.h @@ -51,7 +51,7 @@ class SignalThread; // What to do: Define STRICT_HTTP_ERROR=1 in your makefile. Use HttpError in // your code (HttpErrorType should only be used for code that is shared // with groups which have not yet migrated). -#if STRICT_HTTP_ERROR +#if defined(STRICT_HTTP_ERROR) && STRICT_HTTP_ERROR typedef HttpError HttpErrorType; #else // !STRICT_HTTP_ERROR typedef int HttpErrorType; diff --git a/webrtc/base/httpcommon.cc b/webrtc/base/httpcommon.cc index c90bea51cc..7bc18c4ad9 100644 --- a/webrtc/base/httpcommon.cc +++ b/webrtc/base/httpcommon.cc @@ -388,7 +388,7 @@ bool HttpDateToSeconds(const std::string& date, time_t* seconds) { tm *tm_for_timezone = localtime(&gmt); *seconds = gmt + tm_for_timezone->tm_gmtoff; #else -#if _MSC_VER >= 1900 +#if defined(_MSC_VER) && _MSC_VER >= 1900 long timezone = 0; _get_timezone(&timezone); #endif diff --git a/webrtc/base/ignore_wundef.h b/webrtc/base/ignore_wundef.h new file mode 100644 index 0000000000..b5bf7f79b6 --- /dev/null +++ b/webrtc/base/ignore_wundef.h @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +#ifndef WEBRTC_BASE_IGNORE_WUNDEF_H_ +#define WEBRTC_BASE_IGNORE_WUNDEF_H_ + +// If a header file uses #if on possibly undefined macros (and it's for some +// reason not possible to just fix the header file), include it like this: +// +// RTC_PUSH_IGNORING_WUNDEF() +// #include "misbehaving_header.h" +// RTC_POP_IGNORING_WUNDEF() +// +// This will cause the compiler to not emit -Wundef warnings for that file. + +#ifdef __clang__ +#define RTC_PUSH_IGNORING_WUNDEF() \ + _Pragma("clang diagnostic push") \ + _Pragma("clang diagnostic ignored \"-Wundef\"") +#define RTC_POP_IGNORING_WUNDEF() _Pragma("clang diagnostic pop") +#else +#define RTC_PUSH_IGNORING_WUNDEF() +#define RTC_POP_IGNORING_WUNDEF() +#endif // __clang__ + +#endif // WEBRTC_BASE_IGNORE_WUNDEF_H_ diff --git a/webrtc/base/logging.cc b/webrtc/base/logging.cc index c951e156d8..3624a40bc9 100644 --- a/webrtc/base/logging.cc +++ b/webrtc/base/logging.cc @@ -150,7 +150,7 @@ LogMessage::LogMessage(const char* file, case ERRCTX_ERRNO: tmp << " " << strerror(err); break; -#if WEBRTC_WIN +#ifdef WEBRTC_WIN case ERRCTX_HRESULT: { char msgbuf[256]; DWORD flags = FORMAT_MESSAGE_FROM_SYSTEM; diff --git a/webrtc/base/logging.h b/webrtc/base/logging.h index 631c6384d3..13f0b782b4 100644 --- a/webrtc/base/logging.h +++ b/webrtc/base/logging.h @@ -335,7 +335,7 @@ inline bool LogCheckLevel(LoggingSeverity sev) { LOG_GLE(sev) #define LAST_SYSTEM_ERROR \ (::GetLastError()) -#elif __native_client__ +#elif defined(__native_client__) && __native_client__ #define LOG_ERR_EX(sev, err) \ LOG(sev) #define LOG_ERR(sev) \ diff --git a/webrtc/base/mod_ops_unittest.cc b/webrtc/base/mod_ops_unittest.cc index df59c1313b..931579dd50 100644 --- a/webrtc/base/mod_ops_unittest.cc +++ b/webrtc/base/mod_ops_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/mod_ops.h" namespace webrtc { diff --git a/webrtc/base/pathutils.cc b/webrtc/base/pathutils.cc index a420eb5136..90869b482a 100644 --- a/webrtc/base/pathutils.cc +++ b/webrtc/base/pathutils.cc @@ -33,7 +33,7 @@ const char EXT_DELIM = '.'; const char* const FOLDER_DELIMS = "/\\"; // DEFAULT_FOLDER_DELIM is the preferred delimiter for this platform -#if WEBRTC_WIN +#ifdef WEBRTC_WIN const char DEFAULT_FOLDER_DELIM = '\\'; #else // !WEBRTC_WIN const char DEFAULT_FOLDER_DELIM = '/'; diff --git a/webrtc/base/platform_thread_unittest.cc b/webrtc/base/platform_thread_unittest.cc index 847946aaca..86f091fb1c 100644 --- a/webrtc/base/platform_thread_unittest.cc +++ b/webrtc/base/platform_thread_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/base/platform_thread.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/system_wrappers/include/sleep.h" namespace rtc { diff --git a/webrtc/base/proxydetect.cc b/webrtc/base/proxydetect.cc index 71910aa2d4..111cf4b020 100644 --- a/webrtc/base/proxydetect.cc +++ b/webrtc/base/proxydetect.cc @@ -38,11 +38,15 @@ #include "webrtc/base/pathutils.h" #include "webrtc/base/stringutils.h" -#if defined(WEBRTC_WIN) -#define _TRY_WINHTTP 1 #define _TRY_JSPROXY 0 #define _TRY_WM_FINDPROXY 0 + +#if defined(WEBRTC_WIN) +#define _TRY_WINHTTP 1 #define _TRY_IE_LAN_SETTINGS 1 +#else +#define _TRY_WINHTTP 0 +#define _TRY_IE_LAN_SETTINGS 0 #endif // WEBRTC_WIN // For all platforms try Firefox. diff --git a/webrtc/base/random_unittest.cc b/webrtc/base/random_unittest.cc index ae1a0a2f51..9022206bac 100644 --- a/webrtc/base/random_unittest.cc +++ b/webrtc/base/random_unittest.cc @@ -13,7 +13,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/mathutils.h" // unsigned difference #include "webrtc/base/random.h" diff --git a/webrtc/base/rate_limiter_unittest.cc b/webrtc/base/rate_limiter_unittest.cc index d441128c98..198e3b25a2 100644 --- a/webrtc/base/rate_limiter_unittest.cc +++ b/webrtc/base/rate_limiter_unittest.cc @@ -11,7 +11,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/event.h" #include "webrtc/base/platform_thread.h" diff --git a/webrtc/base/rate_statistics_unittest.cc b/webrtc/base/rate_statistics_unittest.cc index f6ce528ce4..0aa5ac2fc2 100644 --- a/webrtc/base/rate_statistics_unittest.cc +++ b/webrtc/base/rate_statistics_unittest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/rate_statistics.h" namespace { diff --git a/webrtc/base/sequenced_task_checker_unittest.cc b/webrtc/base/sequenced_task_checker_unittest.cc index 2450bd5175..13b1afc50a 100644 --- a/webrtc/base/sequenced_task_checker_unittest.cc +++ b/webrtc/base/sequenced_task_checker_unittest.cc @@ -7,7 +7,7 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/checks.h" #include "webrtc/base/constructormagic.h" #include "webrtc/base/platform_thread.h" @@ -197,7 +197,7 @@ TEST(SequencedTaskCheckerTest, DetachFromTaskQueueAndUseOnThread) { EXPECT_TRUE(done_event.Wait(1000)); } -#if !NDEBUG || DCHECK_ALWAYS_ON +#if !defined(NDEBUG) || DCHECK_ALWAYS_ON TEST(SequencedTaskCheckerTest, MethodNotAllowedOnDifferentThreadInDebug) { RunMethodOnDifferentThread(false); } @@ -207,7 +207,7 @@ TEST(SequencedTaskCheckerTest, MethodAllowedOnDifferentThreadInRelease) { } #endif -#if !NDEBUG || DCHECK_ALWAYS_ON +#if !defined(NDEBUG) || DCHECK_ALWAYS_ON TEST(SequencedTaskCheckerTest, MethodNotAllowedOnDifferentTaskQueueInDebug) { RunMethodOnDifferentTaskQueue(false); } @@ -217,7 +217,7 @@ TEST(SequencedTaskCheckerTest, MethodAllowedOnDifferentTaskQueueInRelease) { } #endif -#if !NDEBUG || DCHECK_ALWAYS_ON +#if !defined(NDEBUG) || DCHECK_ALWAYS_ON TEST(SequencedTaskCheckerTest, DetachFromTaskQueueInDebug) { DetachThenCallFromDifferentTaskQueue(false); } diff --git a/webrtc/base/swap_queue_unittest.cc b/webrtc/base/swap_queue_unittest.cc index 21eb212eb0..ff00626cbc 100644 --- a/webrtc/base/swap_queue_unittest.cc +++ b/webrtc/base/swap_queue_unittest.cc @@ -12,7 +12,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/base/thread_checker_unittest.cc b/webrtc/base/thread_checker_unittest.cc index 0a855a1a94..2e6afe947b 100644 --- a/webrtc/base/thread_checker_unittest.cc +++ b/webrtc/base/thread_checker_unittest.cc @@ -12,7 +12,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/checks.h" #include "webrtc/base/constructormagic.h" #include "webrtc/base/task_queue.h" diff --git a/webrtc/call/bitrate_allocator_unittest.cc b/webrtc/call/bitrate_allocator_unittest.cc index 7473ed457c..811e76d25f 100644 --- a/webrtc/call/bitrate_allocator_unittest.cc +++ b/webrtc/call/bitrate_allocator_unittest.cc @@ -12,8 +12,8 @@ #include #include -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/call/bitrate_allocator.h" #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" diff --git a/webrtc/call/bitrate_estimator_tests.cc b/webrtc/call/bitrate_estimator_tests.cc index 2896c67f37..46f29da295 100644 --- a/webrtc/call/bitrate_estimator_tests.cc +++ b/webrtc/call/bitrate_estimator_tests.cc @@ -12,7 +12,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/api/call/audio_state.h" #include "webrtc/base/checks.h" diff --git a/webrtc/call/call_perf_tests.cc b/webrtc/call/call_perf_tests.cc index b980a5e5c7..6258a85d7d 100644 --- a/webrtc/call/call_perf_tests.cc +++ b/webrtc/call/call_perf_tests.cc @@ -13,7 +13,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/checks.h" #include "webrtc/base/constructormagic.h" diff --git a/webrtc/call/call_unittest.cc b/webrtc/call/call_unittest.cc index 4c2562d75e..14687d5b10 100644 --- a/webrtc/call/call_unittest.cc +++ b/webrtc/call/call_unittest.cc @@ -11,7 +11,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/api/call/audio_state.h" #include "webrtc/call.h" diff --git a/webrtc/call/mock/mock_rtc_event_log.h b/webrtc/call/mock/mock_rtc_event_log.h index 8ca73a3dc7..7558411d03 100644 --- a/webrtc/call/mock/mock_rtc_event_log.h +++ b/webrtc/call/mock/mock_rtc_event_log.h @@ -13,7 +13,7 @@ #include -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/call/rtc_event_log.h" diff --git a/webrtc/call/packet_injection_tests.cc b/webrtc/call/packet_injection_tests.cc index 1d52b884e9..ccd4f4a985 100644 --- a/webrtc/call/packet_injection_tests.cc +++ b/webrtc/call/packet_injection_tests.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/call_test.h" #include "webrtc/test/null_transport.h" diff --git a/webrtc/call/rampup_tests.cc b/webrtc/call/rampup_tests.cc index 2d7dddc1d8..bbfd87b78a 100644 --- a/webrtc/call/rampup_tests.cc +++ b/webrtc/call/rampup_tests.cc @@ -10,7 +10,7 @@ #include "webrtc/call/rampup_tests.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/checks.h" #include "webrtc/base/platform_thread.h" #include "webrtc/test/testsupport/perf_test.h" diff --git a/webrtc/call/ringbuffer_unittest.cc b/webrtc/call/ringbuffer_unittest.cc index e2b5a41461..166c4f6ebb 100644 --- a/webrtc/call/ringbuffer_unittest.cc +++ b/webrtc/call/ringbuffer_unittest.cc @@ -11,7 +11,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/random.h" #include "webrtc/call/ringbuffer.h" diff --git a/webrtc/call/rtc_event_log_helper_thread.h b/webrtc/call/rtc_event_log_helper_thread.h index 2d5a78586d..1408961ec7 100644 --- a/webrtc/call/rtc_event_log_helper_thread.h +++ b/webrtc/call/rtc_event_log_helper_thread.h @@ -19,6 +19,7 @@ #include "webrtc/base/constructormagic.h" #include "webrtc/base/event.h" +#include "webrtc/base/ignore_wundef.h" #include "webrtc/base/platform_thread.h" #include "webrtc/base/swap_queue.h" #include "webrtc/call/ringbuffer.h" @@ -27,11 +28,13 @@ #ifdef ENABLE_RTC_EVENT_LOG // Files generated at build-time by the protobuf compiler. +RTC_PUSH_IGNORING_WUNDEF() #ifdef WEBRTC_ANDROID_PLATFORM_BUILD #include "external/webrtc/webrtc/call/rtc_event_log.pb.h" #else #include "webrtc/call/rtc_event_log.pb.h" #endif +RTC_POP_IGNORING_WUNDEF() #endif #ifdef ENABLE_RTC_EVENT_LOG diff --git a/webrtc/call/rtc_event_log_parser.h b/webrtc/call/rtc_event_log_parser.h index 74f066d575..a50ec20391 100644 --- a/webrtc/call/rtc_event_log_parser.h +++ b/webrtc/call/rtc_event_log_parser.h @@ -13,16 +13,19 @@ #include #include +#include "webrtc/base/ignore_wundef.h" #include "webrtc/call/rtc_event_log.h" #include "webrtc/video_receive_stream.h" #include "webrtc/video_send_stream.h" // Files generated at build-time by the protobuf compiler. +RTC_PUSH_IGNORING_WUNDEF() #ifdef WEBRTC_ANDROID_PLATFORM_BUILD #include "external/webrtc/webrtc/call/rtc_event_log.pb.h" #else #include "webrtc/call/rtc_event_log.pb.h" #endif +RTC_POP_IGNORING_WUNDEF() namespace webrtc { diff --git a/webrtc/call/rtc_event_log_unittest.cc b/webrtc/call/rtc_event_log_unittest.cc index 8e92c7e37d..2a96afe0ff 100644 --- a/webrtc/call/rtc_event_log_unittest.cc +++ b/webrtc/call/rtc_event_log_unittest.cc @@ -14,7 +14,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/buffer.h" #include "webrtc/base/checks.h" #include "webrtc/base/random.h" diff --git a/webrtc/call/rtc_event_log_unittest_helper.cc b/webrtc/call/rtc_event_log_unittest_helper.cc index d7092b8db8..ba19641667 100644 --- a/webrtc/call/rtc_event_log_unittest_helper.cc +++ b/webrtc/call/rtc_event_log_unittest_helper.cc @@ -14,7 +14,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/checks.h" #include "webrtc/test/test_suite.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/common_audio/audio_converter_unittest.cc b/webrtc/common_audio/audio_converter_unittest.cc index f86e37b26f..26bb9735c0 100644 --- a/webrtc/common_audio/audio_converter_unittest.cc +++ b/webrtc/common_audio/audio_converter_unittest.cc @@ -13,7 +13,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/arraysize.h" #include "webrtc/base/format_macros.h" #include "webrtc/common_audio/audio_converter.h" diff --git a/webrtc/common_audio/audio_ring_buffer_unittest.cc b/webrtc/common_audio/audio_ring_buffer_unittest.cc index c5c38de56d..02c48d1505 100644 --- a/webrtc/common_audio/audio_ring_buffer_unittest.cc +++ b/webrtc/common_audio/audio_ring_buffer_unittest.cc @@ -12,7 +12,7 @@ #include "webrtc/common_audio/audio_ring_buffer.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/common_audio/channel_buffer.h" namespace webrtc { diff --git a/webrtc/common_audio/audio_util_unittest.cc b/webrtc/common_audio/audio_util_unittest.cc index 5583778b28..c21eaca99b 100644 --- a/webrtc/common_audio/audio_util_unittest.cc +++ b/webrtc/common_audio/audio_util_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/common_audio/include/audio_util.h" #include "webrtc/typedefs.h" diff --git a/webrtc/common_audio/blocker_unittest.cc b/webrtc/common_audio/blocker_unittest.cc index eea3e2516a..105bb8111c 100644 --- a/webrtc/common_audio/blocker_unittest.cc +++ b/webrtc/common_audio/blocker_unittest.cc @@ -12,7 +12,7 @@ #include "webrtc/common_audio/blocker.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/arraysize.h" namespace { diff --git a/webrtc/common_audio/channel_buffer_unittest.cc b/webrtc/common_audio/channel_buffer_unittest.cc index 98731fc5e7..80c4b72c7e 100644 --- a/webrtc/common_audio/channel_buffer_unittest.cc +++ b/webrtc/common_audio/channel_buffer_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/common_audio/channel_buffer.h" namespace webrtc { diff --git a/webrtc/common_audio/fir_filter_unittest.cc b/webrtc/common_audio/fir_filter_unittest.cc index 9dffcb615f..fdbd3ef8d0 100644 --- a/webrtc/common_audio/fir_filter_unittest.cc +++ b/webrtc/common_audio/fir_filter_unittest.cc @@ -14,7 +14,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { namespace { diff --git a/webrtc/common_audio/lapped_transform_unittest.cc b/webrtc/common_audio/lapped_transform_unittest.cc index a78488e326..66d4a5932e 100644 --- a/webrtc/common_audio/lapped_transform_unittest.cc +++ b/webrtc/common_audio/lapped_transform_unittest.cc @@ -14,7 +14,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" using std::complex; diff --git a/webrtc/common_audio/real_fourier_unittest.cc b/webrtc/common_audio/real_fourier_unittest.cc index 367fec3851..dab28bb0bc 100644 --- a/webrtc/common_audio/real_fourier_unittest.cc +++ b/webrtc/common_audio/real_fourier_unittest.cc @@ -12,7 +12,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/common_audio/real_fourier_openmax.h" #include "webrtc/common_audio/real_fourier_ooura.h" diff --git a/webrtc/common_audio/resampler/push_resampler_unittest.cc b/webrtc/common_audio/resampler/push_resampler_unittest.cc index 53cd495cd0..98657d15b3 100644 --- a/webrtc/common_audio/resampler/push_resampler_unittest.cc +++ b/webrtc/common_audio/resampler/push_resampler_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/checks.h" // force defintion of RTC_DCHECK_IS_ON #include "webrtc/common_audio/resampler/include/push_resampler.h" diff --git a/webrtc/common_audio/resampler/push_sinc_resampler_unittest.cc b/webrtc/common_audio/resampler/push_sinc_resampler_unittest.cc index aca73b2d4b..c9a335885e 100644 --- a/webrtc/common_audio/resampler/push_sinc_resampler_unittest.cc +++ b/webrtc/common_audio/resampler/push_sinc_resampler_unittest.cc @@ -12,8 +12,8 @@ #include #include -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/timeutils.h" #include "webrtc/common_audio/include/audio_util.h" #include "webrtc/common_audio/resampler/push_sinc_resampler.h" diff --git a/webrtc/common_audio/resampler/resampler_unittest.cc b/webrtc/common_audio/resampler/resampler_unittest.cc index c5953d030b..4c10f932de 100644 --- a/webrtc/common_audio/resampler/resampler_unittest.cc +++ b/webrtc/common_audio/resampler/resampler_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/common_audio/resampler/include/resampler.h" diff --git a/webrtc/common_audio/resampler/sinc_resampler_unittest.cc b/webrtc/common_audio/resampler/sinc_resampler_unittest.cc index d3b0dcd428..d965881262 100644 --- a/webrtc/common_audio/resampler/sinc_resampler_unittest.cc +++ b/webrtc/common_audio/resampler/sinc_resampler_unittest.cc @@ -18,8 +18,8 @@ #include -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/timeutils.h" #include "webrtc/common_audio/resampler/sinc_resampler.h" #include "webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h" diff --git a/webrtc/common_audio/ring_buffer_unittest.cc b/webrtc/common_audio/ring_buffer_unittest.cc index 92c470a02d..d62e92d9bf 100644 --- a/webrtc/common_audio/ring_buffer_unittest.cc +++ b/webrtc/common_audio/ring_buffer_unittest.cc @@ -16,7 +16,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/common_audio/signal_processing/real_fft_unittest.cc b/webrtc/common_audio/signal_processing/real_fft_unittest.cc index fa98836b9a..ba8619abb5 100644 --- a/webrtc/common_audio/signal_processing/real_fft_unittest.cc +++ b/webrtc/common_audio/signal_processing/real_fft_unittest.cc @@ -12,7 +12,7 @@ #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/typedefs.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { namespace { diff --git a/webrtc/common_audio/signal_processing/signal_processing_unittest.cc b/webrtc/common_audio/signal_processing/signal_processing_unittest.cc index 445c421ee3..9429bcd701 100644 --- a/webrtc/common_audio/signal_processing/signal_processing_unittest.cc +++ b/webrtc/common_audio/signal_processing/signal_processing_unittest.cc @@ -11,7 +11,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" static const size_t kVector16Size = 9; diff --git a/webrtc/common_audio/sparse_fir_filter_unittest.cc b/webrtc/common_audio/sparse_fir_filter_unittest.cc index 21b28ed34a..edfbf5277b 100644 --- a/webrtc/common_audio/sparse_fir_filter_unittest.cc +++ b/webrtc/common_audio/sparse_fir_filter_unittest.cc @@ -12,7 +12,7 @@ #include "webrtc/common_audio/sparse_fir_filter.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/arraysize.h" #include "webrtc/common_audio/fir_filter.h" diff --git a/webrtc/common_audio/vad/mock/mock_vad.h b/webrtc/common_audio/vad/mock/mock_vad.h index bc763bb9d9..cce72c666c 100644 --- a/webrtc/common_audio/vad/mock/mock_vad.h +++ b/webrtc/common_audio/vad/mock/mock_vad.h @@ -13,7 +13,7 @@ #include "webrtc/common_audio/vad/include/vad.h" -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" namespace webrtc { diff --git a/webrtc/common_audio/vad/vad_core_unittest.cc b/webrtc/common_audio/vad/vad_core_unittest.cc index ee69484f0a..de61bc922e 100644 --- a/webrtc/common_audio/vad/vad_core_unittest.cc +++ b/webrtc/common_audio/vad/vad_core_unittest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/common_audio/vad/vad_unittest.h" #include "webrtc/typedefs.h" diff --git a/webrtc/common_audio/vad/vad_filterbank_unittest.cc b/webrtc/common_audio/vad/vad_filterbank_unittest.cc index 11b503a196..58e70bf04e 100644 --- a/webrtc/common_audio/vad/vad_filterbank_unittest.cc +++ b/webrtc/common_audio/vad/vad_filterbank_unittest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/common_audio/vad/vad_unittest.h" #include "webrtc/typedefs.h" diff --git a/webrtc/common_audio/vad/vad_gmm_unittest.cc b/webrtc/common_audio/vad/vad_gmm_unittest.cc index 31a8a155c4..eff81ddc4e 100644 --- a/webrtc/common_audio/vad/vad_gmm_unittest.cc +++ b/webrtc/common_audio/vad/vad_gmm_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/common_audio/vad/vad_unittest.h" #include "webrtc/typedefs.h" diff --git a/webrtc/common_audio/vad/vad_sp_unittest.cc b/webrtc/common_audio/vad/vad_sp_unittest.cc index 6d5e2a646b..0c6827ff19 100644 --- a/webrtc/common_audio/vad/vad_sp_unittest.cc +++ b/webrtc/common_audio/vad/vad_sp_unittest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/common_audio/vad/vad_unittest.h" #include "webrtc/typedefs.h" diff --git a/webrtc/common_audio/vad/vad_unittest.cc b/webrtc/common_audio/vad/vad_unittest.cc index a0e16b1ce5..a3dcba96c4 100644 --- a/webrtc/common_audio/vad/vad_unittest.cc +++ b/webrtc/common_audio/vad/vad_unittest.cc @@ -12,7 +12,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/arraysize.h" #include "webrtc/base/checks.h" diff --git a/webrtc/common_audio/vad/vad_unittest.h b/webrtc/common_audio/vad/vad_unittest.h index 3efe61b632..ae11340816 100644 --- a/webrtc/common_audio/vad/vad_unittest.h +++ b/webrtc/common_audio/vad/vad_unittest.h @@ -13,7 +13,7 @@ #include // size_t -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/typedefs.h" diff --git a/webrtc/common_audio/wav_file_unittest.cc b/webrtc/common_audio/wav_file_unittest.cc index ba1db1c296..7bad87a7a8 100644 --- a/webrtc/common_audio/wav_file_unittest.cc +++ b/webrtc/common_audio/wav_file_unittest.cc @@ -14,7 +14,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/common_audio/wav_header.h" #include "webrtc/common_audio/wav_file.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/common_audio/wav_header_unittest.cc b/webrtc/common_audio/wav_header_unittest.cc index 8527939eac..cf5e010092 100644 --- a/webrtc/common_audio/wav_header_unittest.cc +++ b/webrtc/common_audio/wav_header_unittest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/common_audio/wav_header.h" namespace webrtc { diff --git a/webrtc/common_audio/window_generator_unittest.cc b/webrtc/common_audio/window_generator_unittest.cc index 124b301df6..d0d2903a68 100644 --- a/webrtc/common_audio/window_generator_unittest.cc +++ b/webrtc/common_audio/window_generator_unittest.cc @@ -12,7 +12,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/common_types.h b/webrtc/common_types.h index b8c0df4b08..b1842ef595 100644 --- a/webrtc/common_types.h +++ b/webrtc/common_types.h @@ -27,9 +27,9 @@ #pragma warning(disable : 4351) #endif -#ifdef WEBRTC_EXPORT +#if defined(WEBRTC_EXPORT) #define WEBRTC_DLLEXPORT _declspec(dllexport) -#elif WEBRTC_DLL +#elif defined(WEBRTC_DLL) #define WEBRTC_DLLEXPORT _declspec(dllimport) #else #define WEBRTC_DLLEXPORT diff --git a/webrtc/common_video/bitrate_adjuster_unittest.cc b/webrtc/common_video/bitrate_adjuster_unittest.cc index d0517e4fcb..5e509b3793 100644 --- a/webrtc/common_video/bitrate_adjuster_unittest.cc +++ b/webrtc/common_video/bitrate_adjuster_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/common_video/include/bitrate_adjuster.h" #include "webrtc/system_wrappers/include/clock.h" diff --git a/webrtc/common_video/h264/pps_parser_unittest.cc b/webrtc/common_video/h264/pps_parser_unittest.cc index 8be8b23ee3..74747536e8 100644 --- a/webrtc/common_video/h264/pps_parser_unittest.cc +++ b/webrtc/common_video/h264/pps_parser_unittest.cc @@ -13,7 +13,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/bitbuffer.h" #include "webrtc/base/buffer.h" diff --git a/webrtc/common_video/h264/sps_parser_unittest.cc b/webrtc/common_video/h264/sps_parser_unittest.cc index 514d41ff9d..bf3cd090df 100644 --- a/webrtc/common_video/h264/sps_parser_unittest.cc +++ b/webrtc/common_video/h264/sps_parser_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/common_video/h264/sps_parser.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/arraysize.h" #include "webrtc/base/bitbuffer.h" diff --git a/webrtc/common_video/h264/sps_vui_rewriter_unittest.cc b/webrtc/common_video/h264/sps_vui_rewriter_unittest.cc index c0298ad7fa..12c274161c 100644 --- a/webrtc/common_video/h264/sps_vui_rewriter_unittest.cc +++ b/webrtc/common_video/h264/sps_vui_rewriter_unittest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/bitbuffer.h" #include "webrtc/base/buffer.h" diff --git a/webrtc/common_video/i420_buffer_pool_unittest.cc b/webrtc/common_video/i420_buffer_pool_unittest.cc index 3307539c4e..7dfe792bfd 100644 --- a/webrtc/common_video/i420_buffer_pool_unittest.cc +++ b/webrtc/common_video/i420_buffer_pool_unittest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/common_video/include/i420_buffer_pool.h" namespace webrtc { diff --git a/webrtc/common_video/i420_video_frame_unittest.cc b/webrtc/common_video/i420_video_frame_unittest.cc index 0ce2daadfe..4d41c9df0f 100644 --- a/webrtc/common_video/i420_video_frame_unittest.cc +++ b/webrtc/common_video/i420_video_frame_unittest.cc @@ -11,7 +11,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/bind.h" #include "webrtc/test/fake_texture_frame.h" #include "webrtc/test/frame_utils.h" diff --git a/webrtc/common_video/libyuv/libyuv_unittest.cc b/webrtc/common_video/libyuv/libyuv_unittest.cc index c6ca212aef..7545168244 100644 --- a/webrtc/common_video/libyuv/libyuv_unittest.cc +++ b/webrtc/common_video/libyuv/libyuv_unittest.cc @@ -13,7 +13,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/video_frame.h" diff --git a/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.m b/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.m index b8add7f84a..b4868a7898 100644 --- a/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.m +++ b/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.m @@ -569,7 +569,7 @@ static __strong NSData *CRLFCRLF; [SSLOptions setValue:[NSNumber numberWithBool:NO] forKey:(__bridge id)kCFStreamSSLValidatesCertificateChain]; } -#if DEBUG +#ifdef DEBUG [SSLOptions setValue:[NSNumber numberWithBool:NO] forKey:(__bridge id)kCFStreamSSLValidatesCertificateChain]; NSLog(@"SocketRocket: In debug mode. Allowing connection to any root cert"); #endif diff --git a/webrtc/media/base/test/mock_mediachannel.h b/webrtc/media/base/test/mock_mediachannel.h index 6330fe0258..6f7e2e5d05 100644 --- a/webrtc/media/base/test/mock_mediachannel.h +++ b/webrtc/media/base/test/mock_mediachannel.h @@ -12,7 +12,7 @@ #define WEBRTC_MEDIA_BASE_TEST_MOCK_MEDIACHANNEL_H_ #include "webrtc/media/base/fakemediaengine.h" -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" namespace webrtc { diff --git a/webrtc/media/engine/nullwebrtcvideoengine_unittest.cc b/webrtc/media/engine/nullwebrtcvideoengine_unittest.cc index 52cd0f2a62..8ccaa2fda3 100644 --- a/webrtc/media/engine/nullwebrtcvideoengine_unittest.cc +++ b/webrtc/media/engine/nullwebrtcvideoengine_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/media/engine/nullwebrtcvideoengine.h" #include "webrtc/media/engine/webrtcvoiceengine.h" diff --git a/webrtc/media/engine/payload_type_mapper_unittest.cc b/webrtc/media/engine/payload_type_mapper_unittest.cc index 7042086638..d11644cf10 100644 --- a/webrtc/media/engine/payload_type_mapper_unittest.cc +++ b/webrtc/media/engine/payload_type_mapper_unittest.cc @@ -11,7 +11,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/media/engine/payload_type_mapper.h" namespace cricket { diff --git a/webrtc/media/engine/simulcast_unittest.cc b/webrtc/media/engine/simulcast_unittest.cc index f01fdcbade..da54767165 100644 --- a/webrtc/media/engine/simulcast_unittest.cc +++ b/webrtc/media/engine/simulcast_unittest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/media/engine/simulcast.h" namespace cricket { diff --git a/webrtc/media/engine/webrtcmediaengine_unittest.cc b/webrtc/media/engine/webrtcmediaengine_unittest.cc index a3e4120e1b..1416324146 100644 --- a/webrtc/media/engine/webrtcmediaengine_unittest.cc +++ b/webrtc/media/engine/webrtcmediaengine_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h" #include "webrtc/media/engine/webrtcmediaengine.h" diff --git a/webrtc/modules/audio_coding/acm2/acm_receive_test_oldapi.cc b/webrtc/modules/audio_coding/acm2/acm_receive_test_oldapi.cc index aac5e1678c..105221b2a8 100644 --- a/webrtc/modules/audio_coding/acm2/acm_receive_test_oldapi.cc +++ b/webrtc/modules/audio_coding/acm2/acm_receive_test_oldapi.cc @@ -15,7 +15,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/include/audio_coding_module.h" #include "webrtc/modules/audio_coding/neteq/tools/audio_sink.h" #include "webrtc/modules/audio_coding/neteq/tools/packet.h" diff --git a/webrtc/modules/audio_coding/acm2/acm_receiver_unittest_oldapi.cc b/webrtc/modules/audio_coding/acm2/acm_receiver_unittest_oldapi.cc index aa4660723d..9551cac726 100644 --- a/webrtc/modules/audio_coding/acm2/acm_receiver_unittest_oldapi.cc +++ b/webrtc/modules/audio_coding/acm2/acm_receiver_unittest_oldapi.cc @@ -13,7 +13,7 @@ #include // std::min #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/checks.h" #include "webrtc/base/safe_conversions.h" #include "webrtc/modules/audio_coding/include/audio_coding_module.h" diff --git a/webrtc/modules/audio_coding/acm2/acm_send_test_oldapi.cc b/webrtc/modules/audio_coding/acm2/acm_send_test_oldapi.cc index e16e55bb61..63ddf3a9d6 100644 --- a/webrtc/modules/audio_coding/acm2/acm_send_test_oldapi.cc +++ b/webrtc/modules/audio_coding/acm2/acm_send_test_oldapi.cc @@ -14,7 +14,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/checks.h" #include "webrtc/modules/audio_coding/codecs/audio_encoder.h" #include "webrtc/modules/audio_coding/include/audio_coding_module.h" diff --git a/webrtc/modules/audio_coding/acm2/audio_coding_module_unittest_oldapi.cc b/webrtc/modules/audio_coding/acm2/audio_coding_module_unittest_oldapi.cc index 2a8b834f96..5ae2038488 100644 --- a/webrtc/modules/audio_coding/acm2/audio_coding_module_unittest_oldapi.cc +++ b/webrtc/modules/audio_coding/acm2/audio_coding_module_unittest_oldapi.cc @@ -13,7 +13,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/criticalsection.h" #include "webrtc/base/md5digest.h" #include "webrtc/base/platform_thread.h" diff --git a/webrtc/modules/audio_coding/acm2/call_statistics_unittest.cc b/webrtc/modules/audio_coding/acm2/call_statistics_unittest.cc index 284532fbfd..7c56b71f3c 100644 --- a/webrtc/modules/audio_coding/acm2/call_statistics_unittest.cc +++ b/webrtc/modules/audio_coding/acm2/call_statistics_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/acm2/call_statistics.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/acm2/codec_manager_unittest.cc b/webrtc/modules/audio_coding/acm2/codec_manager_unittest.cc index e8fe14466b..0108dc0276 100644 --- a/webrtc/modules/audio_coding/acm2/codec_manager_unittest.cc +++ b/webrtc/modules/audio_coding/acm2/codec_manager_unittest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h" #include "webrtc/modules/audio_coding/acm2/codec_manager.h" #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h" diff --git a/webrtc/modules/audio_coding/acm2/rent_a_codec_unittest.cc b/webrtc/modules/audio_coding/acm2/rent_a_codec_unittest.cc index 028a27108c..1816ae4c60 100644 --- a/webrtc/modules/audio_coding/acm2/rent_a_codec_unittest.cc +++ b/webrtc/modules/audio_coding/acm2/rent_a_codec_unittest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/arraysize.h" #include "webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h" #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h" diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc b/webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc index 178d39ce7d..ac508cf4c6 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc +++ b/webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc @@ -11,7 +11,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_controller.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_controller_manager.h" diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller_unittest.cc b/webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller_unittest.cc index 7474abe4bf..bec0ec5df9 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller_unittest.cc +++ b/webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/channel_controller_unittest.cc b/webrtc/modules/audio_coding/audio_network_adaptor/channel_controller_unittest.cc index 2377ebf3d4..2b09563412 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/channel_controller_unittest.cc +++ b/webrtc/modules/audio_coding/audio_network_adaptor/channel_controller_unittest.cc @@ -11,7 +11,7 @@ #include #include "webrtc/modules/audio_coding/audio_network_adaptor/channel_controller.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc b/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc index a6c8436847..b0fb773005 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc +++ b/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_controller.h" #include "webrtc/system_wrappers/include/clock.h" diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/debug_dump_writer.cc b/webrtc/modules/audio_coding/audio_network_adaptor/debug_dump_writer.cc index 9992e2dbd7..a2f258b766 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/debug_dump_writer.cc +++ b/webrtc/modules/audio_coding/audio_network_adaptor/debug_dump_writer.cc @@ -11,13 +11,16 @@ #include "webrtc/modules/audio_coding/audio_network_adaptor/debug_dump_writer.h" #include "webrtc/base/checks.h" +#include "webrtc/base/ignore_wundef.h" #ifdef WEBRTC_AUDIO_NETWORK_ADAPTOR_DEBUG_DUMP +RTC_PUSH_IGNORING_WUNDEF() #ifdef WEBRTC_ANDROID_PLATFORM_BUILD #include "external/webrtc/webrtc/modules/audio_coding/audio_network_adaptor/debug_dump.pb.h" #else #include "webrtc/modules/audio_coding/audio_network_adaptor/debug_dump.pb.h" #endif +RTC_POP_IGNORING_WUNDEF() #endif namespace webrtc { diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller_unittest.cc b/webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller_unittest.cc index e8fda9efe0..8c335d84e6 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller_unittest.cc +++ b/webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller_unittest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_unittest.cc b/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_unittest.cc index c66482f4e2..9bbec26cbe 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_unittest.cc +++ b/webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_unittest.cc @@ -12,7 +12,7 @@ #include "webrtc/modules/audio_coding/audio_network_adaptor/fec_controller.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_smoothing_filter.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller_unittest.cc b/webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller_unittest.cc index 68f3b109b1..5d45646a16 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller_unittest.cc +++ b/webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller_unittest.cc @@ -11,7 +11,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_controller.h b/webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_controller.h index 88db391eca..b7a59cd98b 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_controller.h +++ b/webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_controller.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_CONTROLLER_H_ #define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_CONTROLLER_H_ -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_controller_manager.h b/webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_controller_manager.h index a1cc6250de..5a5808f15e 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_controller_manager.h +++ b/webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_controller_manager.h @@ -15,7 +15,7 @@ #include #include "webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.h" -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_debug_dump_writer.h b/webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_debug_dump_writer.h index f7e226e47f..8be3d2e1d9 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_debug_dump_writer.h +++ b/webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_debug_dump_writer.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_DEBUG_DUMP_WRITER_H_ #define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_DEBUG_DUMP_WRITER_H_ -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/debug_dump_writer.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_smoothing_filter.h b/webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_smoothing_filter.h index f004d1bc61..844f16cd0a 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_smoothing_filter.h +++ b/webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_smoothing_filter.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_SMOOTHING_FILTER_H_ #define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_MOCK_MOCK_SMOOTHING_FILTER_H_ -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/smoothing_filter.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/smoothing_filter_unittest.cc b/webrtc/modules/audio_coding/audio_network_adaptor/smoothing_filter_unittest.cc index 388ae4f999..8ef90f29c8 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/smoothing_filter_unittest.cc +++ b/webrtc/modules/audio_coding/audio_network_adaptor/smoothing_filter_unittest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/audio_network_adaptor/smoothing_filter.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/audio_decoder_factory_unittest.cc b/webrtc/modules/audio_coding/codecs/audio_decoder_factory_unittest.cc index 9b5336927d..bda5391383 100644 --- a/webrtc/modules/audio_coding/codecs/audio_decoder_factory_unittest.cc +++ b/webrtc/modules/audio_coding/codecs/audio_decoder_factory_unittest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc b/webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc index eb6c6d3607..8511e9d570 100644 --- a/webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc +++ b/webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc @@ -11,7 +11,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/constructormagic.h" #include "webrtc/common_audio/vad/mock/mock_vad.h" #include "webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h" diff --git a/webrtc/modules/audio_coding/codecs/cng/cng_unittest.cc b/webrtc/modules/audio_coding/codecs/cng/cng_unittest.cc index 95132a9617..686034804e 100644 --- a/webrtc/modules/audio_coding/codecs/cng/cng_unittest.cc +++ b/webrtc/modules/audio_coding/codecs/cng/cng_unittest.cc @@ -10,7 +10,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h" diff --git a/webrtc/modules/audio_coding/codecs/ilbc/ilbc_unittest.cc b/webrtc/modules/audio_coding/codecs/ilbc/ilbc_unittest.cc index 2abdacae97..a4eaaa26a9 100644 --- a/webrtc/modules/audio_coding/codecs/ilbc/ilbc_unittest.cc +++ b/webrtc/modules/audio_coding/codecs/ilbc/ilbc_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h" #include "webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h" #include "webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame.h" 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 4b03181e45..20c41b8d74 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 @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h" #include "webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_tables.h" 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 3ed57788a1..251f9d3f7e 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 @@ -7,7 +7,7 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/codecs/isac/fix/source/codec.h" #include "webrtc/system_wrappers/include/cpu_features_wrapper.h" #include "webrtc/typedefs.h" 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 0984346019..b0301729d7 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 @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.h" #include "webrtc/system_wrappers/include/cpu_features_wrapper.h" #include "webrtc/typedefs.h" 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 c5cc87ffce..9197483fbe 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 @@ -7,7 +7,7 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/codecs/isac/fix/source/codec.h" #include "webrtc/system_wrappers/include/cpu_features_wrapper.h" diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac_unittest.cc b/webrtc/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac_unittest.cc index 62080954f7..8d781e1d4c 100644 --- a/webrtc/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac_unittest.cc +++ b/webrtc/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac_unittest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/isac_unittest.cc b/webrtc/modules/audio_coding/codecs/isac/main/source/isac_unittest.cc index 6991f90316..b7f4888f83 100644 --- a/webrtc/modules/audio_coding/codecs/isac/main/source/isac_unittest.cc +++ b/webrtc/modules/audio_coding/codecs/isac/main/source/isac_unittest.cc @@ -9,7 +9,7 @@ */ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/codecs/isac/main/include/isac.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/audio_coding/codecs/isac/unittest.cc b/webrtc/modules/audio_coding/codecs/isac/unittest.cc index 890397e587..d304f33d16 100644 --- a/webrtc/modules/audio_coding/codecs/isac/unittest.cc +++ b/webrtc/modules/audio_coding/codecs/isac/unittest.cc @@ -13,7 +13,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/buffer.h" #include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_encoder_isacfix.h" #include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h" diff --git a/webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame_unittest.cc b/webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame_unittest.cc index 9a075639af..30f9737a6a 100644 --- a/webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame_unittest.cc +++ b/webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h" #include "webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame.h" diff --git a/webrtc/modules/audio_coding/codecs/mock/mock_audio_decoder_factory.h b/webrtc/modules/audio_coding/codecs/mock/mock_audio_decoder_factory.h index 59bbb78a4a..676d683da1 100644 --- a/webrtc/modules/audio_coding/codecs/mock/mock_audio_decoder_factory.h +++ b/webrtc/modules/audio_coding/codecs/mock/mock_audio_decoder_factory.h @@ -13,7 +13,7 @@ #include -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/modules/audio_coding/codecs/audio_decoder_factory.h" diff --git a/webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h b/webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h index 2ffb30b708..cf076fa254 100644 --- a/webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h +++ b/webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h @@ -16,7 +16,7 @@ #include "webrtc/base/array_view.h" #include "webrtc/modules/audio_coding/codecs/audio_encoder.h" -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc b/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc index 0adaeee7f4..20b236856a 100644 --- a/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc +++ b/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/checks.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h" diff --git a/webrtc/modules/audio_coding/codecs/opus/opus_fec_test.cc b/webrtc/modules/audio_coding/codecs/opus/opus_fec_test.cc index 560c978b30..c6dcb2e84f 100644 --- a/webrtc/modules/audio_coding/codecs/opus/opus_fec_test.cc +++ b/webrtc/modules/audio_coding/codecs/opus/opus_fec_test.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/format_macros.h" #include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/audio_coding/codecs/opus/opus_inst.h b/webrtc/modules/audio_coding/codecs/opus/opus_inst.h index aa79b46f04..b2be12aee7 100644 --- a/webrtc/modules/audio_coding/codecs/opus/opus_inst.h +++ b/webrtc/modules/audio_coding/codecs/opus/opus_inst.h @@ -13,7 +13,11 @@ #include +#include "webrtc/base/ignore_wundef.h" + +RTC_PUSH_IGNORING_WUNDEF() #include "opus.h" +RTC_POP_IGNORING_WUNDEF() struct WebRtcOpusEncInst { OpusEncoder* encoder; diff --git a/webrtc/modules/audio_coding/codecs/opus/opus_unittest.cc b/webrtc/modules/audio_coding/codecs/opus/opus_unittest.cc index 84b27979b2..63f4e0a1d4 100644 --- a/webrtc/modules/audio_coding/codecs/opus/opus_unittest.cc +++ b/webrtc/modules/audio_coding/codecs/opus/opus_unittest.cc @@ -11,7 +11,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/checks.h" #include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h" #include "webrtc/modules/audio_coding/codecs/opus/opus_inst.h" diff --git a/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc b/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc index 22b2ceb5f7..1d162e179d 100644 --- a/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc +++ b/webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc @@ -11,7 +11,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/checks.h" #include "webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h" #include "webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h" diff --git a/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc b/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc index 3dc665482a..b3fb7cfdd3 100644 --- a/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc +++ b/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/format_macros.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.h b/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.h index 3560eac342..32ff9c6e80 100644 --- a/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.h +++ b/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.h @@ -13,7 +13,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/audio_classifier.h b/webrtc/modules/audio_coding/neteq/audio_classifier.h index 653b275724..c94bd02a00 100644 --- a/webrtc/modules/audio_coding/neteq/audio_classifier.h +++ b/webrtc/modules/audio_coding/neteq/audio_classifier.h @@ -11,8 +11,12 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_CLASSIFIER_H_ #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_CLASSIFIER_H_ +#include "webrtc/base/ignore_wundef.h" + extern "C" { +RTC_PUSH_IGNORING_WUNDEF() #include "celt.h" +RTC_POP_IGNORING_WUNDEF() #include "analysis.h" #include "opus_private.h" } diff --git a/webrtc/modules/audio_coding/neteq/audio_classifier_unittest.cc b/webrtc/modules/audio_coding/neteq/audio_classifier_unittest.cc index bdc5a05920..09c569966b 100644 --- a/webrtc/modules/audio_coding/neteq/audio_classifier_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/audio_classifier_unittest.cc @@ -17,7 +17,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc b/webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc index cddc3eb294..376f8d70e9 100644 --- a/webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc @@ -17,7 +17,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.h" #include "webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h" #include "webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.h" diff --git a/webrtc/modules/audio_coding/neteq/audio_multi_vector_unittest.cc b/webrtc/modules/audio_coding/neteq/audio_multi_vector_unittest.cc index 864c2b2c29..af8d5f1b98 100644 --- a/webrtc/modules/audio_coding/neteq/audio_multi_vector_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/audio_multi_vector_unittest.cc @@ -15,7 +15,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/audio_vector_unittest.cc b/webrtc/modules/audio_coding/neteq/audio_vector_unittest.cc index cee7e58669..e9ef93f80a 100644 --- a/webrtc/modules/audio_coding/neteq/audio_vector_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/audio_vector_unittest.cc @@ -15,7 +15,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/background_noise_unittest.cc b/webrtc/modules/audio_coding/neteq/background_noise_unittest.cc index bd69d67024..3305b2ca4e 100644 --- a/webrtc/modules/audio_coding/neteq/background_noise_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/background_noise_unittest.cc @@ -12,7 +12,7 @@ #include "webrtc/modules/audio_coding/neteq/background_noise.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/buffer_level_filter_unittest.cc b/webrtc/modules/audio_coding/neteq/buffer_level_filter_unittest.cc index 4151a9b1ab..cfa6e3df36 100644 --- a/webrtc/modules/audio_coding/neteq/buffer_level_filter_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/buffer_level_filter_unittest.cc @@ -14,7 +14,7 @@ #include // Access to pow function. -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/comfort_noise_unittest.cc b/webrtc/modules/audio_coding/neteq/comfort_noise_unittest.cc index cc636a1763..19ffd40b6b 100644 --- a/webrtc/modules/audio_coding/neteq/comfort_noise_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/comfort_noise_unittest.cc @@ -12,7 +12,7 @@ #include "webrtc/modules/audio_coding/neteq/comfort_noise.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h" #include "webrtc/modules/audio_coding/neteq/sync_buffer.h" diff --git a/webrtc/modules/audio_coding/neteq/decision_logic_unittest.cc b/webrtc/modules/audio_coding/neteq/decision_logic_unittest.cc index c42ac4422f..e8bbb5eecf 100644 --- a/webrtc/modules/audio_coding/neteq/decision_logic_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/decision_logic_unittest.cc @@ -10,7 +10,7 @@ // Unit tests for DecisionLogic class and derived classes. -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/codecs/mock/mock_audio_decoder_factory.h" #include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h" #include "webrtc/modules/audio_coding/neteq/decoder_database.h" diff --git a/webrtc/modules/audio_coding/neteq/decoder_database_unittest.cc b/webrtc/modules/audio_coding/neteq/decoder_database_unittest.cc index 6ddad14f12..b97a49d784 100644 --- a/webrtc/modules/audio_coding/neteq/decoder_database_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/decoder_database_unittest.cc @@ -15,8 +15,8 @@ #include -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/neteq/mock/mock_audio_decoder.h" #include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h" diff --git a/webrtc/modules/audio_coding/neteq/delay_manager_unittest.cc b/webrtc/modules/audio_coding/neteq/delay_manager_unittest.cc index 3290e9cca6..8ccc73527c 100644 --- a/webrtc/modules/audio_coding/neteq/delay_manager_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/delay_manager_unittest.cc @@ -14,8 +14,8 @@ #include -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/delay_peak_detector_unittest.cc b/webrtc/modules/audio_coding/neteq/delay_peak_detector_unittest.cc index 71a86ff013..e92759399a 100644 --- a/webrtc/modules/audio_coding/neteq/delay_peak_detector_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/delay_peak_detector_unittest.cc @@ -12,7 +12,7 @@ #include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/dsp_helper_unittest.cc b/webrtc/modules/audio_coding/neteq/dsp_helper_unittest.cc index a052a588a9..a77152145f 100644 --- a/webrtc/modules/audio_coding/neteq/dsp_helper_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/dsp_helper_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/audio_coding/neteq/dsp_helper.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_coding/neteq/dtmf_buffer_unittest.cc b/webrtc/modules/audio_coding/neteq/dtmf_buffer_unittest.cc index dad4e76627..1252f819d1 100644 --- a/webrtc/modules/audio_coding/neteq/dtmf_buffer_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/dtmf_buffer_unittest.cc @@ -18,7 +18,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" // Modify the tests so that they pass with the modifications done to DtmfBuffer // for backwards bit-exactness. Once bit-exactness is no longer required, this diff --git a/webrtc/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc b/webrtc/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc index a55e6c9028..7aa207bf61 100644 --- a/webrtc/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc @@ -14,7 +14,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/expand_unittest.cc b/webrtc/modules/audio_coding/neteq/expand_unittest.cc index f19487ab17..a697441e87 100644 --- a/webrtc/modules/audio_coding/neteq/expand_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/expand_unittest.cc @@ -12,7 +12,7 @@ #include "webrtc/modules/audio_coding/neteq/expand.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/safe_conversions.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/modules/audio_coding/neteq/background_noise.h" diff --git a/webrtc/modules/audio_coding/neteq/merge_unittest.cc b/webrtc/modules/audio_coding/neteq/merge_unittest.cc index ddb0e16ddf..b6c62c9d68 100644 --- a/webrtc/modules/audio_coding/neteq/merge_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/merge_unittest.cc @@ -14,7 +14,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/neteq/background_noise.h" #include "webrtc/modules/audio_coding/neteq/expand.h" #include "webrtc/modules/audio_coding/neteq/random_vector.h" diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_audio_decoder.h b/webrtc/modules/audio_coding/neteq/mock/mock_audio_decoder.h index 64be080b96..64eeed195c 100644 --- a/webrtc/modules/audio_coding/neteq/mock/mock_audio_decoder.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_audio_decoder.h @@ -13,7 +13,7 @@ #include "webrtc/modules/audio_coding/codecs/audio_decoder.h" -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_buffer_level_filter.h b/webrtc/modules/audio_coding/neteq/mock/mock_buffer_level_filter.h index 82dee2a345..da228459d4 100644 --- a/webrtc/modules/audio_coding/neteq/mock/mock_buffer_level_filter.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_buffer_level_filter.h @@ -13,7 +13,7 @@ #include "webrtc/modules/audio_coding/neteq/buffer_level_filter.h" -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h b/webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h index d3ee0af765..03ea2452fc 100644 --- a/webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h @@ -15,7 +15,7 @@ #include "webrtc/modules/audio_coding/neteq/decoder_database.h" -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_delay_manager.h b/webrtc/modules/audio_coding/neteq/mock/mock_delay_manager.h index 1e20dca03b..9a0c0e6bd5 100644 --- a/webrtc/modules/audio_coding/neteq/mock/mock_delay_manager.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_delay_manager.h @@ -13,7 +13,7 @@ #include "webrtc/modules/audio_coding/neteq/delay_manager.h" -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h b/webrtc/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h index 5564fba312..3a80cb4e70 100644 --- a/webrtc/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h @@ -13,7 +13,7 @@ #include "webrtc/modules/audio_coding/neteq/delay_peak_detector.h" -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_dtmf_buffer.h b/webrtc/modules/audio_coding/neteq/mock/mock_dtmf_buffer.h index c76ffaf962..0aac22c54d 100644 --- a/webrtc/modules/audio_coding/neteq/mock/mock_dtmf_buffer.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_dtmf_buffer.h @@ -13,7 +13,7 @@ #include "webrtc/modules/audio_coding/neteq/dtmf_buffer.h" -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h b/webrtc/modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h index a1c370e180..bb0a535211 100644 --- a/webrtc/modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h @@ -13,7 +13,7 @@ #include "webrtc/modules/audio_coding/neteq/dtmf_tone_generator.h" -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_expand.h b/webrtc/modules/audio_coding/neteq/mock/mock_expand.h index f5ca077531..9465f6f550 100644 --- a/webrtc/modules/audio_coding/neteq/mock/mock_expand.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_expand.h @@ -13,7 +13,7 @@ #include "webrtc/modules/audio_coding/neteq/expand.h" -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h b/webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h index 23a3ec4c99..1d630e7cf7 100644 --- a/webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h @@ -13,7 +13,7 @@ #include "webrtc/modules/audio_coding/codecs/audio_decoder.h" -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/base/constructormagic.h" #include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_packet_buffer.h b/webrtc/modules/audio_coding/neteq/mock/mock_packet_buffer.h index ef6c97ed53..fd52c3b943 100644 --- a/webrtc/modules/audio_coding/neteq/mock/mock_packet_buffer.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_packet_buffer.h @@ -13,7 +13,7 @@ #include "webrtc/modules/audio_coding/neteq/packet_buffer.h" -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_red_payload_splitter.h b/webrtc/modules/audio_coding/neteq/mock/mock_red_payload_splitter.h index e1f4e04cfd..8c6e93991b 100644 --- a/webrtc/modules/audio_coding/neteq/mock/mock_red_payload_splitter.h +++ b/webrtc/modules/audio_coding/neteq/mock/mock_red_payload_splitter.h @@ -13,7 +13,7 @@ #include "webrtc/modules/audio_coding/neteq/red_payload_splitter.h" -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/nack_tracker_unittest.cc b/webrtc/modules/audio_coding/neteq/nack_tracker_unittest.cc index e5c0c3bc4d..c33a99f539 100644 --- a/webrtc/modules/audio_coding/neteq/nack_tracker_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/nack_tracker_unittest.cc @@ -15,7 +15,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/typedefs.h" #include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h" diff --git a/webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc index a039013712..98962be98f 100644 --- a/webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc @@ -12,7 +12,7 @@ #include -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h" #include "webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h" #include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" diff --git a/webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc index 24a0780609..dfb598b6be 100644 --- a/webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc @@ -13,8 +13,8 @@ #include "webrtc/modules/audio_coding/neteq/include/neteq.h" #include "webrtc/modules/audio_coding/neteq/neteq_impl.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/safe_conversions.h" #include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h" #include "webrtc/modules/audio_coding/codecs/mock/mock_audio_decoder_factory.h" diff --git a/webrtc/modules/audio_coding/neteq/neteq_network_stats_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_network_stats_unittest.cc index 70424fde79..63b2b5bfc1 100644 --- a/webrtc/modules/audio_coding/neteq/neteq_network_stats_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/neteq_network_stats_unittest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.h" #include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h" #include "webrtc/modules/include/module_common_types.h" diff --git a/webrtc/modules/audio_coding/neteq/neteq_stereo_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_stereo_unittest.cc index 14b65627f8..442bf7acac 100644 --- a/webrtc/modules/audio_coding/neteq/neteq_stereo_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/neteq_stereo_unittest.cc @@ -15,7 +15,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h" #include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h" #include "webrtc/modules/audio_coding/neteq/include/neteq.h" diff --git a/webrtc/modules/audio_coding/neteq/neteq_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_unittest.cc index 4b6e5d7ac8..a5b546831c 100644 --- a/webrtc/modules/audio_coding/neteq/neteq_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/neteq_unittest.cc @@ -21,7 +21,8 @@ #include #include "gflags/gflags.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" +#include "webrtc/base/ignore_wundef.h" #include "webrtc/base/sha1digest.h" #include "webrtc/base/stringencode.h" #include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h" @@ -33,11 +34,13 @@ #include "webrtc/typedefs.h" #ifdef WEBRTC_NETEQ_UNITTEST_BITEXACT +RTC_PUSH_IGNORING_WUNDEF() #ifdef WEBRTC_ANDROID_PLATFORM_BUILD #include "external/webrtc/webrtc/modules/audio_coding/neteq/neteq_unittest.pb.h" #else #include "webrtc/audio_coding/neteq/neteq_unittest.pb.h" #endif +RTC_POP_IGNORING_WUNDEF() #endif DEFINE_bool(gen_ref, false, "Generate reference files."); @@ -48,9 +51,9 @@ const std::string& PlatformChecksum(const std::string& checksum_general, const std::string& checksum_android, const std::string& checksum_win_32, const std::string& checksum_win_64) { -#ifdef WEBRTC_ANDROID +#if defined(WEBRTC_ANDROID) return checksum_android; -#elif WEBRTC_WIN +#elif defined(WEBRTC_WIN) #ifdef WEBRTC_ARCH_64_BITS return checksum_win_64; #else diff --git a/webrtc/modules/audio_coding/neteq/normal_unittest.cc b/webrtc/modules/audio_coding/neteq/normal_unittest.cc index 5e1fc131e5..07ec4f7187 100644 --- a/webrtc/modules/audio_coding/neteq/normal_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/normal_unittest.cc @@ -15,7 +15,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h" #include "webrtc/modules/audio_coding/neteq/background_noise.h" diff --git a/webrtc/modules/audio_coding/neteq/packet_buffer_unittest.cc b/webrtc/modules/audio_coding/neteq/packet_buffer_unittest.cc index b1ac5ec17d..2069dbbb5b 100644 --- a/webrtc/modules/audio_coding/neteq/packet_buffer_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/packet_buffer_unittest.cc @@ -12,8 +12,8 @@ #include "webrtc/modules/audio_coding/neteq/packet_buffer.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h" #include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h" #include "webrtc/modules/audio_coding/neteq/packet.h" diff --git a/webrtc/modules/audio_coding/neteq/post_decode_vad_unittest.cc b/webrtc/modules/audio_coding/neteq/post_decode_vad_unittest.cc index 65efa7a23e..231d7f1d7f 100644 --- a/webrtc/modules/audio_coding/neteq/post_decode_vad_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/post_decode_vad_unittest.cc @@ -12,7 +12,7 @@ #include "webrtc/modules/audio_coding/neteq/post_decode_vad.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/random_vector_unittest.cc b/webrtc/modules/audio_coding/neteq/random_vector_unittest.cc index ad8e32ded4..ca0a378bb5 100644 --- a/webrtc/modules/audio_coding/neteq/random_vector_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/random_vector_unittest.cc @@ -12,7 +12,7 @@ #include "webrtc/modules/audio_coding/neteq/random_vector.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/red_payload_splitter_unittest.cc b/webrtc/modules/audio_coding/neteq/red_payload_splitter_unittest.cc index 5396ff4d0a..7528e2bd18 100644 --- a/webrtc/modules/audio_coding/neteq/red_payload_splitter_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/red_payload_splitter_unittest.cc @@ -17,7 +17,7 @@ #include #include // pair -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h" #include "webrtc/modules/audio_coding/codecs/mock/mock_audio_decoder_factory.h" #include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h" diff --git a/webrtc/modules/audio_coding/neteq/sync_buffer_unittest.cc b/webrtc/modules/audio_coding/neteq/sync_buffer_unittest.cc index 0f7b98978d..5a6260c0b3 100644 --- a/webrtc/modules/audio_coding/neteq/sync_buffer_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/sync_buffer_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/audio_coding/neteq/sync_buffer.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/test/RTPjitter.cc b/webrtc/modules/audio_coding/neteq/test/RTPjitter.cc index 75983d259e..391f051f30 100644 --- a/webrtc/modules/audio_coding/neteq/test/RTPjitter.cc +++ b/webrtc/modules/audio_coding/neteq/test/RTPjitter.cc @@ -25,7 +25,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/typedefs.h" /*********************/ diff --git a/webrtc/modules/audio_coding/neteq/test/RTPtimeshift.cc b/webrtc/modules/audio_coding/neteq/test/RTPtimeshift.cc index f45a97af2f..e419c5dbaa 100644 --- a/webrtc/modules/audio_coding/neteq/test/RTPtimeshift.cc +++ b/webrtc/modules/audio_coding/neteq/test/RTPtimeshift.cc @@ -12,7 +12,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h" #define FIRSTLINELEN 40 diff --git a/webrtc/modules/audio_coding/neteq/test/neteq_performance_unittest.cc b/webrtc/modules/audio_coding/neteq/test/neteq_performance_unittest.cc index 14857c772b..f9775b5923 100644 --- a/webrtc/modules/audio_coding/neteq/test/neteq_performance_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/test/neteq_performance_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/neteq/tools/neteq_performance_test.h" #include "webrtc/test/testsupport/perf_test.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_coding/neteq/tick_timer_unittest.cc b/webrtc/modules/audio_coding/neteq/tick_timer_unittest.cc index 55edcf5b29..6f338d19ac 100644 --- a/webrtc/modules/audio_coding/neteq/tick_timer_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/tick_timer_unittest.cc @@ -12,8 +12,8 @@ #include "webrtc/modules/audio_coding/neteq/tick_timer.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/time_stretch_unittest.cc b/webrtc/modules/audio_coding/neteq/time_stretch_unittest.cc index 8a32d20a50..6f84089b68 100644 --- a/webrtc/modules/audio_coding/neteq/time_stretch_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/time_stretch_unittest.cc @@ -16,7 +16,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/checks.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" #include "webrtc/modules/audio_coding/neteq/background_noise.h" diff --git a/webrtc/modules/audio_coding/neteq/timestamp_scaler_unittest.cc b/webrtc/modules/audio_coding/neteq/timestamp_scaler_unittest.cc index 96cf2e45db..ed7a9a25a5 100644 --- a/webrtc/modules/audio_coding/neteq/timestamp_scaler_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/timestamp_scaler_unittest.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/audio_coding/neteq/timestamp_scaler.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h" #include "webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h" #include "webrtc/modules/audio_coding/neteq/packet.h" diff --git a/webrtc/modules/audio_coding/neteq/tools/input_audio_file_unittest.cc b/webrtc/modules/audio_coding/neteq/tools/input_audio_file_unittest.cc index 13d847b76e..ff795d81eb 100644 --- a/webrtc/modules/audio_coding/neteq/tools/input_audio_file_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/tools/input_audio_file_unittest.cc @@ -12,7 +12,7 @@ #include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.cc b/webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.cc index 15cb5cfcc1..2422f075b7 100644 --- a/webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.cc +++ b/webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.cc @@ -12,7 +12,7 @@ #include "webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.h" #include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/format_macros.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h b/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h index aa895ce769..d8bd2cee17 100644 --- a/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h +++ b/webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.h @@ -14,7 +14,7 @@ #include #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/neteq/include/neteq.h" #include "webrtc/modules/audio_coding/neteq/tools/audio_sink.h" #include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" diff --git a/webrtc/modules/audio_coding/neteq/tools/packet_unittest.cc b/webrtc/modules/audio_coding/neteq/tools/packet_unittest.cc index b32f54e03c..940276bdfc 100644 --- a/webrtc/modules/audio_coding/neteq/tools/packet_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/tools/packet_unittest.cc @@ -12,7 +12,7 @@ #include "webrtc/modules/audio_coding/neteq/tools/packet.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_coding/test/APITest.cc b/webrtc/modules/audio_coding/test/APITest.cc index c30830849b..771ca87439 100644 --- a/webrtc/modules/audio_coding/test/APITest.cc +++ b/webrtc/modules/audio_coding/test/APITest.cc @@ -19,7 +19,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/platform_thread.h" #include "webrtc/base/timeutils.h" #include "webrtc/common_types.h" diff --git a/webrtc/modules/audio_coding/test/EncodeDecodeTest.cc b/webrtc/modules/audio_coding/test/EncodeDecodeTest.cc index 724502354e..93591f57ae 100644 --- a/webrtc/modules/audio_coding/test/EncodeDecodeTest.cc +++ b/webrtc/modules/audio_coding/test/EncodeDecodeTest.cc @@ -15,7 +15,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/include/audio_coding_module.h" #include "webrtc/modules/audio_coding/acm2/acm_common_defs.h" diff --git a/webrtc/modules/audio_coding/test/PCMFile.cc b/webrtc/modules/audio_coding/test/PCMFile.cc index b4acf35005..d16071b6a7 100644 --- a/webrtc/modules/audio_coding/test/PCMFile.cc +++ b/webrtc/modules/audio_coding/test/PCMFile.cc @@ -14,7 +14,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/include/module_common_types.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/test/PacketLossTest.cc b/webrtc/modules/audio_coding/test/PacketLossTest.cc index f6764ac977..68f26150bc 100644 --- a/webrtc/modules/audio_coding/test/PacketLossTest.cc +++ b/webrtc/modules/audio_coding/test/PacketLossTest.cc @@ -12,7 +12,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/test/RTPFile.cc b/webrtc/modules/audio_coding/test/RTPFile.cc index 2ffe3dae74..d59d38cef4 100644 --- a/webrtc/modules/audio_coding/test/RTPFile.cc +++ b/webrtc/modules/audio_coding/test/RTPFile.cc @@ -23,7 +23,7 @@ #include "webrtc/engine_configurations.h" #include "webrtc/system_wrappers/include/rw_lock_wrapper.h" // TODO(tlegrand): Consider removing usage of gtest. -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_coding/test/TestAllCodecs.cc b/webrtc/modules/audio_coding/test/TestAllCodecs.cc index 80a0464d38..74caaf4c27 100644 --- a/webrtc/modules/audio_coding/test/TestAllCodecs.cc +++ b/webrtc/modules/audio_coding/test/TestAllCodecs.cc @@ -14,7 +14,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/common_types.h" #include "webrtc/engine_configurations.h" diff --git a/webrtc/modules/audio_coding/test/TestStereo.cc b/webrtc/modules/audio_coding/test/TestStereo.cc index 85a2ae283b..f0eb477dad 100644 --- a/webrtc/modules/audio_coding/test/TestStereo.cc +++ b/webrtc/modules/audio_coding/test/TestStereo.cc @@ -14,7 +14,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/common_types.h" #include "webrtc/engine_configurations.h" #include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h" diff --git a/webrtc/modules/audio_coding/test/Tester.cc b/webrtc/modules/audio_coding/test/Tester.cc index a27f0bc58b..f09cae33b5 100644 --- a/webrtc/modules/audio_coding/test/Tester.cc +++ b/webrtc/modules/audio_coding/test/Tester.cc @@ -12,7 +12,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/include/audio_coding_module.h" #include "webrtc/modules/audio_coding/test/APITest.h" #include "webrtc/modules/audio_coding/test/EncodeDecodeTest.h" diff --git a/webrtc/modules/audio_coding/test/TwoWayCommunication.cc b/webrtc/modules/audio_coding/test/TwoWayCommunication.cc index a5cf79e86a..bc36a02455 100644 --- a/webrtc/modules/audio_coding/test/TwoWayCommunication.cc +++ b/webrtc/modules/audio_coding/test/TwoWayCommunication.cc @@ -20,7 +20,7 @@ #include #endif -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/engine_configurations.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h" diff --git a/webrtc/modules/audio_coding/test/delay_test.cc b/webrtc/modules/audio_coding/test/delay_test.cc index 04428d50b4..5ab98d3fd2 100644 --- a/webrtc/modules/audio_coding/test/delay_test.cc +++ b/webrtc/modules/audio_coding/test/delay_test.cc @@ -15,7 +15,7 @@ #include #include "gflags/gflags.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/common_types.h" #include "webrtc/engine_configurations.h" #include "webrtc/modules/audio_coding/include/audio_coding_module.h" diff --git a/webrtc/modules/audio_coding/test/iSACTest.cc b/webrtc/modules/audio_coding/test/iSACTest.cc index f06833c2d9..9729cf817a 100644 --- a/webrtc/modules/audio_coding/test/iSACTest.cc +++ b/webrtc/modules/audio_coding/test/iSACTest.cc @@ -14,9 +14,9 @@ #include #include -#if _WIN32 +#ifdef _WIN32 #include -#elif WEBRTC_LINUX +#elif defined(WEBRTC_LINUX) #include #else #include diff --git a/webrtc/modules/audio_coding/test/insert_packet_with_timing.cc b/webrtc/modules/audio_coding/test/insert_packet_with_timing.cc index 27a8833ac6..98ce06ad75 100644 --- a/webrtc/modules/audio_coding/test/insert_packet_with_timing.cc +++ b/webrtc/modules/audio_coding/test/insert_packet_with_timing.cc @@ -13,7 +13,7 @@ #include #include "gflags/gflags.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/include/audio_coding_module.h" #include "webrtc/modules/audio_coding/test/Channel.h" diff --git a/webrtc/modules/audio_coding/test/opus_test.cc b/webrtc/modules/audio_coding/test/opus_test.cc index 5d250280f4..ba2a9df5ee 100644 --- a/webrtc/modules/audio_coding/test/opus_test.cc +++ b/webrtc/modules/audio_coding/test/opus_test.cc @@ -14,7 +14,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/common_types.h" #include "webrtc/engine_configurations.h" #include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h" diff --git a/webrtc/modules/audio_coding/test/target_delay_unittest.cc b/webrtc/modules/audio_coding/test/target_delay_unittest.cc index 5de5bf262b..6b0f2af359 100644 --- a/webrtc/modules/audio_coding/test/target_delay_unittest.cc +++ b/webrtc/modules/audio_coding/test/target_delay_unittest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h" #include "webrtc/modules/audio_coding/include/audio_coding_module.h" diff --git a/webrtc/modules/audio_coding/test/utility.cc b/webrtc/modules/audio_coding/test/utility.cc index 58b5a68444..3a0afa1232 100644 --- a/webrtc/modules/audio_coding/test/utility.cc +++ b/webrtc/modules/audio_coding/test/utility.cc @@ -15,7 +15,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/include/audio_coding_module.h" #include "webrtc/modules/audio_coding/acm2/acm_common_defs.h" diff --git a/webrtc/modules/audio_coding/test/utility.h b/webrtc/modules/audio_coding/test/utility.h index b6c3a7ae16..fe85933cfd 100644 --- a/webrtc/modules/audio_coding/test/utility.h +++ b/webrtc/modules/audio_coding/test/utility.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_TEST_UTILITY_H_ #define WEBRTC_MODULES_AUDIO_CODING_TEST_UTILITY_H_ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/include/audio_coding_module.h" namespace webrtc { diff --git a/webrtc/modules/audio_conference_mixer/source/memory_pool.h b/webrtc/modules/audio_conference_mixer/source/memory_pool.h index 3c7e1b71a9..c0a813116b 100644 --- a/webrtc/modules/audio_conference_mixer/source/memory_pool.h +++ b/webrtc/modules/audio_conference_mixer/source/memory_pool.h @@ -15,7 +15,7 @@ #include "webrtc/typedefs.h" -#if _WIN32 +#ifdef _WIN32 #include "webrtc/modules/audio_conference_mixer/source/memory_pool_win.h" #else #include "webrtc/modules/audio_conference_mixer/source/memory_pool_posix.h" diff --git a/webrtc/modules/audio_conference_mixer/test/audio_conference_mixer_unittest.cc b/webrtc/modules/audio_conference_mixer/test/audio_conference_mixer_unittest.cc index e553e45b71..2acbfbf9ef 100644 --- a/webrtc/modules/audio_conference_mixer/test/audio_conference_mixer_unittest.cc +++ b/webrtc/modules/audio_conference_mixer/test/audio_conference_mixer_unittest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h" #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h" diff --git a/webrtc/modules/audio_device/android/audio_device_unittest.cc b/webrtc/modules/audio_device/android/audio_device_unittest.cc index e3a4920fdf..cfbe96f8d7 100644 --- a/webrtc/modules/audio_device/android/audio_device_unittest.cc +++ b/webrtc/modules/audio_device/android/audio_device_unittest.cc @@ -16,8 +16,8 @@ #include #include -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/arraysize.h" #include "webrtc/base/criticalsection.h" #include "webrtc/base/format_macros.h" diff --git a/webrtc/modules/audio_device/android/audio_manager_unittest.cc b/webrtc/modules/audio_device/android/audio_manager_unittest.cc index a655c1b4cf..bf81f7ff98 100644 --- a/webrtc/modules/audio_device/android/audio_manager_unittest.cc +++ b/webrtc/modules/audio_device/android/audio_manager_unittest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/arraysize.h" #include "webrtc/base/format_macros.h" #include "webrtc/modules/audio_device/android/build_info.h" diff --git a/webrtc/modules/audio_device/android/ensure_initialized.cc b/webrtc/modules/audio_device/android/ensure_initialized.cc index 27a98d2952..9bc08ab196 100644 --- a/webrtc/modules/audio_device/android/ensure_initialized.cc +++ b/webrtc/modules/audio_device/android/ensure_initialized.cc @@ -12,10 +12,14 @@ #include +#include "webrtc/base/ignore_wundef.h" + // Note: this dependency is dangerous since it reaches into Chromium's base. // There's a risk of e.g. macro clashes. This file may only be used in tests. +RTC_PUSH_IGNORING_WUNDEF() #include "base/android/context_utils.h" #include "base/android/jni_android.h" +RTC_POP_IGNORING_WUNDEF() #include "webrtc/base/checks.h" #include "webrtc/modules/audio_device/android/audio_record_jni.h" #include "webrtc/modules/audio_device/android/audio_track_jni.h" diff --git a/webrtc/modules/audio_device/fine_audio_buffer_unittest.cc b/webrtc/modules/audio_device/fine_audio_buffer_unittest.cc index ef189d1fef..a0dfb976e9 100644 --- a/webrtc/modules/audio_device/fine_audio_buffer_unittest.cc +++ b/webrtc/modules/audio_device/fine_audio_buffer_unittest.cc @@ -13,8 +13,8 @@ #include #include -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_device/mock_audio_device_buffer.h" using ::testing::_; diff --git a/webrtc/modules/audio_device/include/mock_audio_device.h b/webrtc/modules/audio_device/include/mock_audio_device.h index 4cd2441777..00c95a8c72 100644 --- a/webrtc/modules/audio_device/include/mock_audio_device.h +++ b/webrtc/modules/audio_device/include/mock_audio_device.h @@ -12,7 +12,7 @@ #define WEBRTC_MODULES_AUDIO_DEVICE_INCLUDE_MOCK_AUDIO_DEVICE_H_ #include -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/modules/audio_device/include/audio_device.h" namespace webrtc { diff --git a/webrtc/modules/audio_device/ios/audio_device_ios.mm b/webrtc/modules/audio_device/ios/audio_device_ios.mm index dc6cdcb8e4..f1040d8e4e 100644 --- a/webrtc/modules/audio_device/ios/audio_device_ios.mm +++ b/webrtc/modules/audio_device/ios/audio_device_ios.mm @@ -84,7 +84,8 @@ static void LogDeviceInfo() { LOG(LS_INFO) << " process ID: " << ios::GetProcessID(); LOG(LS_INFO) << " OS version: " << ios::GetOSVersionString(); LOG(LS_INFO) << " processing cores: " << ios::GetProcessorCount(); -#if defined(__IPHONE_9_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_9_0 +#if defined(__IPHONE_9_0) && defined(__IPHONE_OS_VERSION_MAX_ALLOWED) \ + && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_9_0 LOG(LS_INFO) << " low power mode: " << ios::GetLowPowerModeEnabled(); #endif } 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 1641572040..56dbdc5268 100644 --- a/webrtc/modules/audio_device/ios/audio_device_unittest_ios.cc +++ b/webrtc/modules/audio_device/ios/audio_device_unittest_ios.cc @@ -16,8 +16,8 @@ #include #include -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/arraysize.h" #include "webrtc/base/criticalsection.h" #include "webrtc/base/format_macros.h" diff --git a/webrtc/modules/audio_device/ios/objc/RTCAudioSessionTest.mm b/webrtc/modules/audio_device/ios/objc/RTCAudioSessionTest.mm index 7cbd2a982a..93a1e903d9 100644 --- a/webrtc/modules/audio_device/ios/objc/RTCAudioSessionTest.mm +++ b/webrtc/modules/audio_device/ios/objc/RTCAudioSessionTest.mm @@ -10,7 +10,7 @@ #import -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #import "webrtc/modules/audio_device/ios/objc/RTCAudioSession.h" #import "webrtc/modules/audio_device/ios/objc/RTCAudioSession+Private.h" diff --git a/webrtc/modules/audio_device/mock_audio_device_buffer.h b/webrtc/modules/audio_device/mock_audio_device_buffer.h index 07c9e2912e..8d09655496 100644 --- a/webrtc/modules/audio_device/mock_audio_device_buffer.h +++ b/webrtc/modules/audio_device/mock_audio_device_buffer.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_AUDIO_DEVICE_MOCK_AUDIO_DEVICE_BUFFER_H_ #define WEBRTC_MODULES_AUDIO_DEVICE_MOCK_AUDIO_DEVICE_BUFFER_H_ -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/modules/audio_device/audio_device_buffer.h" namespace webrtc { 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 1b3c428067..d124e9c56e 100644 --- a/webrtc/modules/audio_device/test/audio_device_test_api.cc +++ b/webrtc/modules/audio_device/test/audio_device_test_api.cc @@ -16,7 +16,7 @@ #include "webrtc/modules/audio_device/test/audio_device_test_defines.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/modules/audio_device/audio_device_config.h" diff --git a/webrtc/modules/audio_mixer/test/audio_mixer_unittest.cc b/webrtc/modules/audio_mixer/test/audio_mixer_unittest.cc index 5258fdce9c..ed10685c80 100644 --- a/webrtc/modules/audio_mixer/test/audio_mixer_unittest.cc +++ b/webrtc/modules/audio_mixer/test/audio_mixer_unittest.cc @@ -13,7 +13,7 @@ #include #include -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/base/bind.h" #include "webrtc/base/thread.h" #include "webrtc/modules/audio_mixer/audio_mixer_defines.h" diff --git a/webrtc/modules/audio_processing/aec/echo_cancellation_unittest.cc b/webrtc/modules/audio_processing/aec/echo_cancellation_unittest.cc index 074816c9a5..58fff81e0f 100644 --- a/webrtc/modules/audio_processing/aec/echo_cancellation_unittest.cc +++ b/webrtc/modules/audio_processing/aec/echo_cancellation_unittest.cc @@ -16,7 +16,7 @@ #include #include "webrtc/modules/audio_processing/aec/aec_core.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/checks.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/aec/system_delay_unittest.cc b/webrtc/modules/audio_processing/aec/system_delay_unittest.cc index 51a4df2b78..d29642ea1e 100644 --- a/webrtc/modules/audio_processing/aec/system_delay_unittest.cc +++ b/webrtc/modules/audio_processing/aec/system_delay_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_processing/aec/aec_core.h" #include "webrtc/modules/audio_processing/aec/echo_cancellation.h" #include "webrtc/typedefs.h" 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 ce4db59139..397f38ccb3 100644 --- a/webrtc/modules/audio_processing/agc/agc_manager_direct_unittest.cc +++ b/webrtc/modules/audio_processing/agc/agc_manager_direct_unittest.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/audio_processing/agc/agc_manager_direct.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_processing/agc/mock_agc.h" #include "webrtc/modules/audio_processing/include/mock_audio_processing.h" diff --git a/webrtc/modules/audio_processing/agc/loudness_histogram_unittest.cc b/webrtc/modules/audio_processing/agc/loudness_histogram_unittest.cc index 62db545325..5c0b4ca1d8 100644 --- a/webrtc/modules/audio_processing/agc/loudness_histogram_unittest.cc +++ b/webrtc/modules/audio_processing/agc/loudness_histogram_unittest.cc @@ -17,7 +17,7 @@ #include #include -#include "gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/modules/audio_processing/agc/utility.h" diff --git a/webrtc/modules/audio_processing/agc/mock_agc.h b/webrtc/modules/audio_processing/agc/mock_agc.h index 9e8f64e838..4a837e5a2a 100644 --- a/webrtc/modules/audio_processing/agc/mock_agc.h +++ b/webrtc/modules/audio_processing/agc/mock_agc.h @@ -13,7 +13,7 @@ #include "webrtc/modules/audio_processing/agc/agc.h" -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/modules/include/module_common_types.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/audio_buffer_unittest.cc b/webrtc/modules/audio_processing/audio_buffer_unittest.cc index c6a5e1daad..38855d6545 100644 --- a/webrtc/modules/audio_processing/audio_buffer_unittest.cc +++ b/webrtc/modules/audio_processing/audio_buffer_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_processing/audio_buffer.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/audio_processing_impl.h b/webrtc/modules/audio_processing/audio_processing_impl.h index 91754fdfbe..c8162c1b66 100644 --- a/webrtc/modules/audio_processing/audio_processing_impl.h +++ b/webrtc/modules/audio_processing/audio_processing_impl.h @@ -17,6 +17,7 @@ #include #include "webrtc/base/criticalsection.h" +#include "webrtc/base/ignore_wundef.h" #include "webrtc/base/thread_annotations.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" @@ -24,11 +25,13 @@ #ifdef WEBRTC_AUDIOPROC_DEBUG_DUMP // Files generated at build-time by the protobuf compiler. +RTC_PUSH_IGNORING_WUNDEF() #ifdef WEBRTC_ANDROID_PLATFORM_BUILD #include "external/webrtc/webrtc/modules/audio_processing/debug.pb.h" #else #include "webrtc/modules/audio_processing/debug.pb.h" #endif +RTC_POP_IGNORING_WUNDEF() #endif // WEBRTC_AUDIOPROC_DEBUG_DUMP namespace webrtc { diff --git a/webrtc/modules/audio_processing/audio_processing_impl_locking_unittest.cc b/webrtc/modules/audio_processing/audio_processing_impl_locking_unittest.cc index 547e149132..c55537d362 100644 --- a/webrtc/modules/audio_processing/audio_processing_impl_locking_unittest.cc +++ b/webrtc/modules/audio_processing/audio_processing_impl_locking_unittest.cc @@ -14,7 +14,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/array_view.h" #include "webrtc/base/criticalsection.h" #include "webrtc/base/event.h" diff --git a/webrtc/modules/audio_processing/audio_processing_impl_unittest.cc b/webrtc/modules/audio_processing/audio_processing_impl_unittest.cc index a0c208ac79..9f5b5157f7 100644 --- a/webrtc/modules/audio_processing/audio_processing_impl_unittest.cc +++ b/webrtc/modules/audio_processing/audio_processing_impl_unittest.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/audio_processing/audio_processing_impl.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/config.h" #include "webrtc/modules/audio_processing/test/test_utils.h" #include "webrtc/modules/include/module_common_types.h" diff --git a/webrtc/modules/audio_processing/audio_processing_performance_unittest.cc b/webrtc/modules/audio_processing/audio_processing_performance_unittest.cc index a29c96d682..0048180d9a 100644 --- a/webrtc/modules/audio_processing/audio_processing_performance_unittest.cc +++ b/webrtc/modules/audio_processing/audio_processing_performance_unittest.cc @@ -15,7 +15,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/array_view.h" #include "webrtc/base/atomicops.h" #include "webrtc/base/platform_thread.h" diff --git a/webrtc/modules/audio_processing/audio_processing_unittest.cc b/webrtc/modules/audio_processing/audio_processing_unittest.cc index 646e8b7b87..b0c652654b 100644 --- a/webrtc/modules/audio_processing/audio_processing_unittest.cc +++ b/webrtc/modules/audio_processing/audio_processing_unittest.cc @@ -18,6 +18,7 @@ #include "webrtc/base/arraysize.h" #include "webrtc/base/checks.h" +#include "webrtc/base/ignore_wundef.h" #include "webrtc/common_audio/include/audio_util.h" #include "webrtc/common_audio/resampler/include/push_resampler.h" #include "webrtc/common_audio/resampler/push_sinc_resampler.h" @@ -30,14 +31,16 @@ #include "webrtc/modules/include/module_common_types.h" #include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/system_wrappers/include/trace.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" + +RTC_PUSH_IGNORING_WUNDEF() #ifdef WEBRTC_ANDROID_PLATFORM_BUILD -#include "gtest/gtest.h" #include "external/webrtc/webrtc/modules/audio_processing/test/unittest.pb.h" #else -#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/audio_processing/unittest.pb.h" #endif +RTC_POP_IGNORING_WUNDEF() namespace webrtc { namespace { diff --git a/webrtc/modules/audio_processing/beamformer/array_util_unittest.cc b/webrtc/modules/audio_processing/beamformer/array_util_unittest.cc index e3a7bbd7aa..0ec9e7b738 100644 --- a/webrtc/modules/audio_processing/beamformer/array_util_unittest.cc +++ b/webrtc/modules/audio_processing/beamformer/array_util_unittest.cc @@ -16,7 +16,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/beamformer/complex_matrix_unittest.cc b/webrtc/modules/audio_processing/beamformer/complex_matrix_unittest.cc index 63c8c4ff51..9ad790fd32 100644 --- a/webrtc/modules/audio_processing/beamformer/complex_matrix_unittest.cc +++ b/webrtc/modules/audio_processing/beamformer/complex_matrix_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_processing/beamformer/complex_matrix.h" #include "webrtc/modules/audio_processing/beamformer/matrix_test_helpers.h" diff --git a/webrtc/modules/audio_processing/beamformer/covariance_matrix_generator.cc b/webrtc/modules/audio_processing/beamformer/covariance_matrix_generator.cc index 78f4df5ca9..5ca79c6475 100644 --- a/webrtc/modules/audio_processing/beamformer/covariance_matrix_generator.cc +++ b/webrtc/modules/audio_processing/beamformer/covariance_matrix_generator.cc @@ -18,7 +18,7 @@ namespace webrtc { namespace { float BesselJ0(float x) { -#if WEBRTC_WIN +#ifdef WEBRTC_WIN return _j0(x); #else return j0(x); diff --git a/webrtc/modules/audio_processing/beamformer/covariance_matrix_generator_unittest.cc b/webrtc/modules/audio_processing/beamformer/covariance_matrix_generator_unittest.cc index 23d672fb4e..b754e2081c 100644 --- a/webrtc/modules/audio_processing/beamformer/covariance_matrix_generator_unittest.cc +++ b/webrtc/modules/audio_processing/beamformer/covariance_matrix_generator_unittest.cc @@ -14,7 +14,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_processing/beamformer/matrix_test_helpers.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/beamformer/matrix_test_helpers.h b/webrtc/modules/audio_processing/beamformer/matrix_test_helpers.h index 9891a8220c..2ec412f184 100644 --- a/webrtc/modules/audio_processing/beamformer/matrix_test_helpers.h +++ b/webrtc/modules/audio_processing/beamformer/matrix_test_helpers.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_BEAMFORMER_MATRIX_TEST_HELPERS_H_ #define WEBRTC_MODULES_AUDIO_PROCESSING_BEAMFORMER_MATRIX_TEST_HELPERS_H_ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_processing/beamformer/complex_matrix.h" #include "webrtc/modules/audio_processing/beamformer/matrix.h" diff --git a/webrtc/modules/audio_processing/beamformer/matrix_unittest.cc b/webrtc/modules/audio_processing/beamformer/matrix_unittest.cc index 04aed7017b..66adb0e78e 100644 --- a/webrtc/modules/audio_processing/beamformer/matrix_unittest.cc +++ b/webrtc/modules/audio_processing/beamformer/matrix_unittest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_processing/beamformer/matrix.h" #include "webrtc/modules/audio_processing/beamformer/matrix_test_helpers.h" diff --git a/webrtc/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h b/webrtc/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h index 3bb1485942..b0be4ac7f3 100644 --- a/webrtc/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h +++ b/webrtc/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h @@ -13,7 +13,7 @@ #include -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/modules/audio_processing/beamformer/nonlinear_beamformer.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc b/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc index 1ad3ed6c2e..ee211f28a8 100644 --- a/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc +++ b/webrtc/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc @@ -15,7 +15,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/array_view.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/test/audio_buffer_tools.h" diff --git a/webrtc/modules/audio_processing/config_unittest.cc b/webrtc/modules/audio_processing/config_unittest.cc index 2dd9f0d999..33f4ed152c 100644 --- a/webrtc/modules/audio_processing/config_unittest.cc +++ b/webrtc/modules/audio_processing/config_unittest.cc @@ -9,7 +9,7 @@ */ #include "webrtc/modules/audio_processing/include/config.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { namespace { diff --git a/webrtc/modules/audio_processing/echo_cancellation_bit_exact_unittest.cc b/webrtc/modules/audio_processing/echo_cancellation_bit_exact_unittest.cc index a79a03d5dc..cc6af2ee9d 100644 --- a/webrtc/modules/audio_processing/echo_cancellation_bit_exact_unittest.cc +++ b/webrtc/modules/audio_processing/echo_cancellation_bit_exact_unittest.cc @@ -9,7 +9,7 @@ */ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/array_view.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/echo_cancellation_impl.h" diff --git a/webrtc/modules/audio_processing/echo_cancellation_impl_unittest.cc b/webrtc/modules/audio_processing/echo_cancellation_impl_unittest.cc index e9a936fb52..ceb27e51ea 100644 --- a/webrtc/modules/audio_processing/echo_cancellation_impl_unittest.cc +++ b/webrtc/modules/audio_processing/echo_cancellation_impl_unittest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_processing/aec/aec_core.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" diff --git a/webrtc/modules/audio_processing/echo_control_mobile_unittest.cc b/webrtc/modules/audio_processing/echo_control_mobile_unittest.cc index d163781866..4293814a4e 100644 --- a/webrtc/modules/audio_processing/echo_control_mobile_unittest.cc +++ b/webrtc/modules/audio_processing/echo_control_mobile_unittest.cc @@ -9,7 +9,7 @@ */ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/array_view.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/echo_control_mobile_impl.h" diff --git a/webrtc/modules/audio_processing/gain_control_unittest.cc b/webrtc/modules/audio_processing/gain_control_unittest.cc index c3d1d6c246..413a7b6166 100644 --- a/webrtc/modules/audio_processing/gain_control_unittest.cc +++ b/webrtc/modules/audio_processing/gain_control_unittest.cc @@ -9,7 +9,7 @@ */ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/array_view.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/gain_control_impl.h" diff --git a/webrtc/modules/audio_processing/high_pass_filter_unittest.cc b/webrtc/modules/audio_processing/high_pass_filter_unittest.cc index f0414c0814..db746f6149 100644 --- a/webrtc/modules/audio_processing/high_pass_filter_unittest.cc +++ b/webrtc/modules/audio_processing/high_pass_filter_unittest.cc @@ -9,7 +9,7 @@ */ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/array_view.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/high_pass_filter_impl.h" diff --git a/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer_unittest.cc b/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer_unittest.cc index 0c56870976..bccfd0911d 100644 --- a/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer_unittest.cc +++ b/webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer_unittest.cc @@ -15,7 +15,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/array_view.h" #include "webrtc/base/arraysize.h" #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h" diff --git a/webrtc/modules/audio_processing/intelligibility/intelligibility_utils_unittest.cc b/webrtc/modules/audio_processing/intelligibility/intelligibility_utils_unittest.cc index 08e8368c08..a9d3d31ad4 100644 --- a/webrtc/modules/audio_processing/intelligibility/intelligibility_utils_unittest.cc +++ b/webrtc/modules/audio_processing/intelligibility/intelligibility_utils_unittest.cc @@ -12,7 +12,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/arraysize.h" #include "webrtc/modules/audio_processing/intelligibility/intelligibility_utils.h" diff --git a/webrtc/modules/audio_processing/intelligibility/test/intelligibility_proc.cc b/webrtc/modules/audio_processing/intelligibility/test/intelligibility_proc.cc index c9281245b7..bf3dba9c49 100644 --- a/webrtc/modules/audio_processing/intelligibility/test/intelligibility_proc.cc +++ b/webrtc/modules/audio_processing/intelligibility/test/intelligibility_proc.cc @@ -9,7 +9,7 @@ */ #include "gflags/gflags.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/criticalsection.h" #include "webrtc/common_audio/channel_buffer.h" #include "webrtc/common_audio/include/audio_util.h" diff --git a/webrtc/modules/audio_processing/level_controller/level_controller_complexity_unittest.cc b/webrtc/modules/audio_processing/level_controller/level_controller_complexity_unittest.cc index b8033aa144..bfd719b023 100644 --- a/webrtc/modules/audio_processing/level_controller/level_controller_complexity_unittest.cc +++ b/webrtc/modules/audio_processing/level_controller/level_controller_complexity_unittest.cc @@ -11,7 +11,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/array_view.h" #include "webrtc/base/random.h" #include "webrtc/modules/audio_processing/audio_buffer.h" diff --git a/webrtc/modules/audio_processing/level_controller/level_controller_unittest.cc b/webrtc/modules/audio_processing/level_controller/level_controller_unittest.cc index f5cea0dbcc..dc07e4952d 100644 --- a/webrtc/modules/audio_processing/level_controller/level_controller_unittest.cc +++ b/webrtc/modules/audio_processing/level_controller/level_controller_unittest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/array_view.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" diff --git a/webrtc/modules/audio_processing/level_estimator_unittest.cc b/webrtc/modules/audio_processing/level_estimator_unittest.cc index cb3bdf5096..ce7064d658 100644 --- a/webrtc/modules/audio_processing/level_estimator_unittest.cc +++ b/webrtc/modules/audio_processing/level_estimator_unittest.cc @@ -9,7 +9,7 @@ */ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/array_view.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/level_estimator_impl.h" diff --git a/webrtc/modules/audio_processing/noise_suppression_unittest.cc b/webrtc/modules/audio_processing/noise_suppression_unittest.cc index 320e1c5a68..47636141d9 100644 --- a/webrtc/modules/audio_processing/noise_suppression_unittest.cc +++ b/webrtc/modules/audio_processing/noise_suppression_unittest.cc @@ -9,7 +9,7 @@ */ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/array_view.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/noise_suppression_impl.h" diff --git a/webrtc/modules/audio_processing/splitting_filter_unittest.cc b/webrtc/modules/audio_processing/splitting_filter_unittest.cc index e7af65115c..96a6408b82 100644 --- a/webrtc/modules/audio_processing/splitting_filter_unittest.cc +++ b/webrtc/modules/audio_processing/splitting_filter_unittest.cc @@ -13,7 +13,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/common_audio/channel_buffer.h" #include "webrtc/modules/audio_processing/splitting_filter.h" diff --git a/webrtc/modules/audio_processing/test/aec_dump_based_simulator.h b/webrtc/modules/audio_processing/test/aec_dump_based_simulator.h index cefc21bccc..c3d273cf4a 100644 --- a/webrtc/modules/audio_processing/test/aec_dump_based_simulator.h +++ b/webrtc/modules/audio_processing/test/aec_dump_based_simulator.h @@ -14,12 +14,15 @@ #include "webrtc/modules/audio_processing/test/audio_processing_simulator.h" #include "webrtc/base/constructormagic.h" +#include "webrtc/base/ignore_wundef.h" +RTC_PUSH_IGNORING_WUNDEF() #ifdef WEBRTC_ANDROID_PLATFORM_BUILD #include "external/webrtc/webrtc/modules/audio_processing/debug.pb.h" #else #include "webrtc/modules/audio_processing/debug.pb.h" #endif +RTC_POP_IGNORING_WUNDEF() namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_processing/test/bitexactness_tools.h b/webrtc/modules/audio_processing/test/bitexactness_tools.h index d4c09d49c6..4ddc7e3bae 100644 --- a/webrtc/modules/audio_processing/test/bitexactness_tools.h +++ b/webrtc/modules/audio_processing/test/bitexactness_tools.h @@ -16,7 +16,7 @@ #include "webrtc/base/array_view.h" #include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_processing/test/debug_dump_replayer.h b/webrtc/modules/audio_processing/test/debug_dump_replayer.h index 09022542d9..3bf886c090 100644 --- a/webrtc/modules/audio_processing/test/debug_dump_replayer.h +++ b/webrtc/modules/audio_processing/test/debug_dump_replayer.h @@ -14,10 +14,14 @@ #include #include +#include "webrtc/base/ignore_wundef.h" #include "webrtc/common_audio/channel_buffer.h" -#include "webrtc/modules/audio_processing/debug.pb.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" +RTC_PUSH_IGNORING_WUNDEF() +#include "webrtc/modules/audio_processing/debug.pb.h" +RTC_POP_IGNORING_WUNDEF() + namespace webrtc { namespace test { diff --git a/webrtc/modules/audio_processing/test/debug_dump_test.cc b/webrtc/modules/audio_processing/test/debug_dump_test.cc index 99873429ea..b8d4b439f9 100644 --- a/webrtc/modules/audio_processing/test/debug_dump_test.cc +++ b/webrtc/modules/audio_processing/test/debug_dump_test.cc @@ -14,7 +14,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h" #include "webrtc/modules/audio_processing/test/debug_dump_replayer.h" #include "webrtc/modules/audio_processing/test/test_utils.h" diff --git a/webrtc/modules/audio_processing/test/process_test.cc b/webrtc/modules/audio_processing/test/process_test.cc index f1ac71752a..55df1d7780 100644 --- a/webrtc/modules/audio_processing/test/process_test.cc +++ b/webrtc/modules/audio_processing/test/process_test.cc @@ -19,6 +19,7 @@ #include #include "webrtc/base/format_macros.h" +#include "webrtc/base/ignore_wundef.h" #include "webrtc/base/timeutils.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/modules/audio_processing/include/config.h" @@ -26,15 +27,17 @@ #include "webrtc/modules/audio_processing/test/test_utils.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/system_wrappers/include/cpu_features_wrapper.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/perf_test.h" + +RTC_PUSH_IGNORING_WUNDEF() #ifdef WEBRTC_ANDROID_PLATFORM_BUILD -#include "gtest/gtest.h" #include "external/webrtc/webrtc/modules/audio_processing/debug.pb.h" #else -#include "testing/gtest/include/gtest/gtest.h" #include "webrtc/modules/audio_processing/debug.pb.h" #endif +RTC_POP_IGNORING_WUNDEF() namespace webrtc { diff --git a/webrtc/modules/audio_processing/test/protobuf_utils.h b/webrtc/modules/audio_processing/test/protobuf_utils.h index 3ab90b7761..e132c9405c 100644 --- a/webrtc/modules/audio_processing/test/protobuf_utils.h +++ b/webrtc/modules/audio_processing/test/protobuf_utils.h @@ -13,7 +13,11 @@ #include +#include "webrtc/base/ignore_wundef.h" + +RTC_PUSH_IGNORING_WUNDEF() #include "webrtc/modules/audio_processing/debug.pb.h" +RTC_POP_IGNORING_WUNDEF() namespace webrtc { diff --git a/webrtc/modules/audio_processing/test/unpack.cc b/webrtc/modules/audio_processing/test/unpack.cc index d3f1633832..61e1ebe91c 100644 --- a/webrtc/modules/audio_processing/test/unpack.cc +++ b/webrtc/modules/audio_processing/test/unpack.cc @@ -19,11 +19,15 @@ #include "gflags/gflags.h" #include "webrtc/base/format_macros.h" -#include "webrtc/modules/audio_processing/debug.pb.h" +#include "webrtc/base/ignore_wundef.h" #include "webrtc/modules/audio_processing/test/protobuf_utils.h" #include "webrtc/modules/audio_processing/test/test_utils.h" #include "webrtc/typedefs.h" +RTC_PUSH_IGNORING_WUNDEF() +#include "webrtc/modules/audio_processing/debug.pb.h" +RTC_POP_IGNORING_WUNDEF() + // TODO(andrew): unpack more of the data. DEFINE_string(input_file, "input", "The name of the input stream file."); DEFINE_string(output_file, "ref_out", diff --git a/webrtc/modules/audio_processing/transient/dyadic_decimator_unittest.cc b/webrtc/modules/audio_processing/transient/dyadic_decimator_unittest.cc index f5c9f49dba..7f5bb03e71 100644 --- a/webrtc/modules/audio_processing/transient/dyadic_decimator_unittest.cc +++ b/webrtc/modules/audio_processing/transient/dyadic_decimator_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/audio_processing/transient/dyadic_decimator.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.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 6a848c6539..c975934349 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 #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/system_wrappers/include/file_wrapper.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/audio_processing/transient/moving_moments_unittest.cc b/webrtc/modules/audio_processing/transient/moving_moments_unittest.cc index f1aa77329b..eb645eecfa 100644 --- a/webrtc/modules/audio_processing/transient/moving_moments_unittest.cc +++ b/webrtc/modules/audio_processing/transient/moving_moments_unittest.cc @@ -12,7 +12,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/transient/transient_detector_unittest.cc b/webrtc/modules/audio_processing/transient/transient_detector_unittest.cc index fedddb7d8f..dcf1e345a7 100644 --- a/webrtc/modules/audio_processing/transient/transient_detector_unittest.cc +++ b/webrtc/modules/audio_processing/transient/transient_detector_unittest.cc @@ -14,7 +14,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_processing/transient/common.h" #include "webrtc/modules/audio_processing/transient/file_utils.h" #include "webrtc/system_wrappers/include/file_wrapper.h" diff --git a/webrtc/modules/audio_processing/transient/transient_suppression_test.cc b/webrtc/modules/audio_processing/transient/transient_suppression_test.cc index 90ebb226d2..447b3d4320 100644 --- a/webrtc/modules/audio_processing/transient/transient_suppression_test.cc +++ b/webrtc/modules/audio_processing/transient/transient_suppression_test.cc @@ -17,7 +17,7 @@ #include #include "gflags/gflags.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/common_audio/include/audio_util.h" #include "webrtc/modules/audio_processing/agc/agc.h" #include "webrtc/modules/include/module_common_types.h" diff --git a/webrtc/modules/audio_processing/transient/transient_suppressor_unittest.cc b/webrtc/modules/audio_processing/transient/transient_suppressor_unittest.cc index 0c1010e090..1e671240b3 100644 --- a/webrtc/modules/audio_processing/transient/transient_suppressor_unittest.cc +++ b/webrtc/modules/audio_processing/transient/transient_suppressor_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/audio_processing/transient/transient_suppressor.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_processing/transient/common.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/transient/wpd_node_unittest.cc b/webrtc/modules/audio_processing/transient/wpd_node_unittest.cc index 7ab6da8949..3a9cb759f2 100644 --- a/webrtc/modules/audio_processing/transient/wpd_node_unittest.cc +++ b/webrtc/modules/audio_processing/transient/wpd_node_unittest.cc @@ -12,7 +12,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.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 3b08314d3b..61a67e5bec 100644 --- a/webrtc/modules/audio_processing/transient/wpd_tree_unittest.cc +++ b/webrtc/modules/audio_processing/transient/wpd_tree_unittest.cc @@ -14,7 +14,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.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/include/file_wrapper.h" diff --git a/webrtc/modules/audio_processing/utility/block_mean_calculator_unittest.cc b/webrtc/modules/audio_processing/utility/block_mean_calculator_unittest.cc index 3f74ac9302..91146a6b4d 100644 --- a/webrtc/modules/audio_processing/utility/block_mean_calculator_unittest.cc +++ b/webrtc/modules/audio_processing/utility/block_mean_calculator_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_processing/utility/block_mean_calculator.h" diff --git a/webrtc/modules/audio_processing/utility/delay_estimator_unittest.cc b/webrtc/modules/audio_processing/utility/delay_estimator_unittest.cc index 3e46763a6a..a7d363a7a5 100644 --- a/webrtc/modules/audio_processing/utility/delay_estimator_unittest.cc +++ b/webrtc/modules/audio_processing/utility/delay_estimator_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_processing/utility/delay_estimator.h" #include "webrtc/modules/audio_processing/utility/delay_estimator_internal.h" diff --git a/webrtc/modules/audio_processing/vad/gmm_unittest.cc b/webrtc/modules/audio_processing/vad/gmm_unittest.cc index f8e1bde776..5444cbc273 100644 --- a/webrtc/modules/audio_processing/vad/gmm_unittest.cc +++ b/webrtc/modules/audio_processing/vad/gmm_unittest.cc @@ -12,7 +12,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_processing/vad/noise_gmm_tables.h" #include "webrtc/modules/audio_processing/vad/voice_gmm_tables.h" diff --git a/webrtc/modules/audio_processing/vad/pitch_based_vad_unittest.cc b/webrtc/modules/audio_processing/vad/pitch_based_vad_unittest.cc index 04ddcab5cb..5d82095135 100644 --- a/webrtc/modules/audio_processing/vad/pitch_based_vad_unittest.cc +++ b/webrtc/modules/audio_processing/vad/pitch_based_vad_unittest.cc @@ -15,7 +15,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/vad/pitch_internal_unittest.cc b/webrtc/modules/audio_processing/vad/pitch_internal_unittest.cc index 8b5959d03e..70124f85ac 100644 --- a/webrtc/modules/audio_processing/vad/pitch_internal_unittest.cc +++ b/webrtc/modules/audio_processing/vad/pitch_internal_unittest.cc @@ -12,7 +12,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" TEST(PitchInternalTest, test) { const int kSamplingRateHz = 8000; diff --git a/webrtc/modules/audio_processing/vad/pole_zero_filter_unittest.cc b/webrtc/modules/audio_processing/vad/pole_zero_filter_unittest.cc index b3a0eb0107..4bb8308955 100644 --- a/webrtc/modules/audio_processing/vad/pole_zero_filter_unittest.cc +++ b/webrtc/modules/audio_processing/vad/pole_zero_filter_unittest.cc @@ -15,7 +15,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_processing/vad/vad_audio_proc_internal.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/audio_processing/vad/standalone_vad_unittest.cc b/webrtc/modules/audio_processing/vad/standalone_vad_unittest.cc index 482a20a898..c920415f4d 100644 --- a/webrtc/modules/audio_processing/vad/standalone_vad_unittest.cc +++ b/webrtc/modules/audio_processing/vad/standalone_vad_unittest.cc @@ -14,7 +14,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/audio_processing/vad/vad_audio_proc_unittest.cc b/webrtc/modules/audio_processing/vad/vad_audio_proc_unittest.cc index a8a4ead2e3..1de1b73f7c 100644 --- a/webrtc/modules/audio_processing/vad/vad_audio_proc_unittest.cc +++ b/webrtc/modules/audio_processing/vad/vad_audio_proc_unittest.cc @@ -19,7 +19,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_processing/vad/common.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/audio_processing/vad/vad_circular_buffer_unittest.cc b/webrtc/modules/audio_processing/vad/vad_circular_buffer_unittest.cc index 81c3a2df9c..5291ff8d8b 100644 --- a/webrtc/modules/audio_processing/vad/vad_circular_buffer_unittest.cc +++ b/webrtc/modules/audio_processing/vad/vad_circular_buffer_unittest.cc @@ -14,7 +14,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/vad/voice_activity_detector_unittest.cc b/webrtc/modules/audio_processing/vad/voice_activity_detector_unittest.cc index f4ee17760e..d43b1352d7 100644 --- a/webrtc/modules/audio_processing/vad/voice_activity_detector_unittest.cc +++ b/webrtc/modules/audio_processing/vad/voice_activity_detector_unittest.cc @@ -13,7 +13,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/voice_detection_unittest.cc b/webrtc/modules/audio_processing/voice_detection_unittest.cc index 791bd55500..171c1d6b42 100644 --- a/webrtc/modules/audio_processing/voice_detection_unittest.cc +++ b/webrtc/modules/audio_processing/voice_detection_unittest.cc @@ -9,7 +9,7 @@ */ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/array_view.h" #include "webrtc/modules/audio_processing/audio_buffer.h" #include "webrtc/modules/audio_processing/voice_detection_impl.h" diff --git a/webrtc/modules/bitrate_controller/bitrate_controller_unittest.cc b/webrtc/modules/bitrate_controller/bitrate_controller_unittest.cc index 43060e2d1a..7da947b7b2 100644 --- a/webrtc/modules/bitrate_controller/bitrate_controller_unittest.cc +++ b/webrtc/modules/bitrate_controller/bitrate_controller_unittest.cc @@ -11,7 +11,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/call/mock/mock_rtc_event_log.h" #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" diff --git a/webrtc/modules/bitrate_controller/include/mock/mock_bitrate_controller.h b/webrtc/modules/bitrate_controller/include/mock/mock_bitrate_controller.h index dc7e286b10..ee545f5b8a 100644 --- a/webrtc/modules/bitrate_controller/include/mock/mock_bitrate_controller.h +++ b/webrtc/modules/bitrate_controller/include/mock/mock_bitrate_controller.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_BITRATE_CONTROLLER_INCLUDE_MOCK_MOCK_BITRATE_CONTROLLER_H_ #define WEBRTC_MODULES_BITRATE_CONTROLLER_INCLUDE_MOCK_MOCK_BITRATE_CONTROLLER_H_ -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" namespace webrtc { diff --git a/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation_unittest.cc b/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation_unittest.cc index 0a15a4123d..7368a48bda 100644 --- a/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation_unittest.cc +++ b/webrtc/modules/bitrate_controller/send_side_bandwidth_estimation_unittest.cc @@ -11,7 +11,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/call/mock/mock_rtc_event_log.h" #include "webrtc/modules/bitrate_controller/send_side_bandwidth_estimation.h" diff --git a/webrtc/modules/congestion_controller/congestion_controller_unittest.cc b/webrtc/modules/congestion_controller/congestion_controller_unittest.cc index 79cb2ed0af..8d1005d88d 100644 --- a/webrtc/modules/congestion_controller/congestion_controller_unittest.cc +++ b/webrtc/modules/congestion_controller/congestion_controller_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/call/mock/mock_rtc_event_log.h" #include "webrtc/modules/pacing/mock/mock_paced_sender.h" #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" diff --git a/webrtc/modules/congestion_controller/delay_based_bwe_unittest.cc b/webrtc/modules/congestion_controller/delay_based_bwe_unittest.cc index 6319e988b7..7220967be2 100644 --- a/webrtc/modules/congestion_controller/delay_based_bwe_unittest.cc +++ b/webrtc/modules/congestion_controller/delay_based_bwe_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/constructormagic.h" #include "webrtc/modules/pacing/paced_sender.h" #include "webrtc/modules/congestion_controller/delay_based_bwe.h" diff --git a/webrtc/modules/congestion_controller/delay_based_bwe_unittest_helper.h b/webrtc/modules/congestion_controller/delay_based_bwe_unittest_helper.h index c91c580272..f97cd5272d 100644 --- a/webrtc/modules/congestion_controller/delay_based_bwe_unittest_helper.h +++ b/webrtc/modules/congestion_controller/delay_based_bwe_unittest_helper.h @@ -17,7 +17,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/constructormagic.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "webrtc/system_wrappers/include/clock.h" diff --git a/webrtc/modules/congestion_controller/include/mock/mock_congestion_controller.h b/webrtc/modules/congestion_controller/include/mock/mock_congestion_controller.h index f7d4aaa951..143efd4646 100644 --- a/webrtc/modules/congestion_controller/include/mock/mock_congestion_controller.h +++ b/webrtc/modules/congestion_controller/include/mock/mock_congestion_controller.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_MOCK_MOCK_CONGESTION_CONTROLLER_H_ #define WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_MOCK_MOCK_CONGESTION_CONTROLLER_H_ -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/base/constructormagic.h" #include "webrtc/base/socket.h" #include "webrtc/modules/congestion_controller/include/congestion_controller.h" diff --git a/webrtc/modules/congestion_controller/probe_bitrate_estimator_unittest.cc b/webrtc/modules/congestion_controller/probe_bitrate_estimator_unittest.cc index e4ec739e18..cd12b58012 100644 --- a/webrtc/modules/congestion_controller/probe_bitrate_estimator_unittest.cc +++ b/webrtc/modules/congestion_controller/probe_bitrate_estimator_unittest.cc @@ -13,8 +13,8 @@ #include #include -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h" namespace webrtc { diff --git a/webrtc/modules/congestion_controller/probe_controller_unittest.cc b/webrtc/modules/congestion_controller/probe_controller_unittest.cc index 9e01660aa2..a57cad0514 100644 --- a/webrtc/modules/congestion_controller/probe_controller_unittest.cc +++ b/webrtc/modules/congestion_controller/probe_controller_unittest.cc @@ -9,8 +9,8 @@ */ #include -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/logging.h" #include "webrtc/modules/congestion_controller/probe_controller.h" #include "webrtc/modules/pacing/mock/mock_paced_sender.h" 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 9e89439b6f..5e7a02a9c8 100644 --- a/webrtc/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc +++ b/webrtc/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc @@ -12,7 +12,7 @@ #include "webrtc/modules/desktop_capture/desktop_and_cursor_composer.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/desktop_capture/desktop_capture_options.h" #include "webrtc/modules/desktop_capture/desktop_frame.h" #include "webrtc/modules/desktop_capture/mouse_cursor.h" diff --git a/webrtc/modules/desktop_capture/desktop_region_unittest.cc b/webrtc/modules/desktop_capture/desktop_region_unittest.cc index 3062f0b93c..16f8626096 100644 --- a/webrtc/modules/desktop_capture/desktop_region_unittest.cc +++ b/webrtc/modules/desktop_capture/desktop_region_unittest.cc @@ -12,7 +12,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/differ_block_unittest.cc b/webrtc/modules/desktop_capture/differ_block_unittest.cc index 636f453a3b..e981cc11c9 100644 --- a/webrtc/modules/desktop_capture/differ_block_unittest.cc +++ b/webrtc/modules/desktop_capture/differ_block_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/modules/desktop_capture/differ_block.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 35197ef9dc..663e970a4d 100644 --- a/webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc +++ b/webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc @@ -12,7 +12,7 @@ #include "webrtc/modules/desktop_capture/mouse_cursor_monitor.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/desktop_capture/desktop_capture_options.h" #include "webrtc/modules/desktop_capture/desktop_frame.h" #include "webrtc/modules/desktop_capture/mouse_cursor.h" diff --git a/webrtc/modules/desktop_capture/rgba_color_unittest.cc b/webrtc/modules/desktop_capture/rgba_color_unittest.cc index 33e4fb7474..dc750219e0 100644 --- a/webrtc/modules/desktop_capture/rgba_color_unittest.cc +++ b/webrtc/modules/desktop_capture/rgba_color_unittest.cc @@ -12,7 +12,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/screen_capturer_differ_wrapper_unittest.cc b/webrtc/modules/desktop_capture/screen_capturer_differ_wrapper_unittest.cc index e667553b14..0aad0e0dd9 100644 --- a/webrtc/modules/desktop_capture/screen_capturer_differ_wrapper_unittest.cc +++ b/webrtc/modules/desktop_capture/screen_capturer_differ_wrapper_unittest.cc @@ -15,7 +15,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/random.h" #include "webrtc/base/timeutils.h" #include "webrtc/modules/desktop_capture/desktop_geometry.h" diff --git a/webrtc/modules/desktop_capture/screen_capturer_helper_unittest.cc b/webrtc/modules/desktop_capture/screen_capturer_helper_unittest.cc index 13388b461a..76e7eb36f9 100644 --- a/webrtc/modules/desktop_capture/screen_capturer_helper_unittest.cc +++ b/webrtc/modules/desktop_capture/screen_capturer_helper_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/desktop_capture/screen_capturer_helper.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/desktop_capture/screen_capturer_mac_unittest.cc b/webrtc/modules/desktop_capture/screen_capturer_mac_unittest.cc index 47e7219996..7b83a830f0 100644 --- a/webrtc/modules/desktop_capture/screen_capturer_mac_unittest.cc +++ b/webrtc/modules/desktop_capture/screen_capturer_mac_unittest.cc @@ -15,7 +15,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/desktop_capture/desktop_capture_options.h" #include "webrtc/modules/desktop_capture/desktop_frame.h" #include "webrtc/modules/desktop_capture/desktop_geometry.h" diff --git a/webrtc/modules/desktop_capture/screen_capturer_mock_objects.h b/webrtc/modules/desktop_capture/screen_capturer_mock_objects.h index 1f17e8c8be..82944a7a21 100644 --- a/webrtc/modules/desktop_capture/screen_capturer_mock_objects.h +++ b/webrtc/modules/desktop_capture/screen_capturer_mock_objects.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_SCREEN_CAPTURER_MOCK_OBJECTS_H_ #define WEBRTC_MODULES_DESKTOP_CAPTURE_SCREEN_CAPTURER_MOCK_OBJECTS_H_ -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/base/constructormagic.h" #include "webrtc/modules/desktop_capture/screen_capturer.h" diff --git a/webrtc/modules/desktop_capture/screen_capturer_unittest.cc b/webrtc/modules/desktop_capture/screen_capturer_unittest.cc index 6a70dc23cc..fa666a929b 100644 --- a/webrtc/modules/desktop_capture/screen_capturer_unittest.cc +++ b/webrtc/modules/desktop_capture/screen_capturer_unittest.cc @@ -17,8 +17,8 @@ #include "webrtc/modules/desktop_capture/screen_capturer.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/checks.h" #include "webrtc/base/constructormagic.h" #include "webrtc/base/logging.h" diff --git a/webrtc/modules/desktop_capture/screen_drawer_unittest.cc b/webrtc/modules/desktop_capture/screen_drawer_unittest.cc index b5f6ba5c1b..499c6905ec 100644 --- a/webrtc/modules/desktop_capture/screen_drawer_unittest.cc +++ b/webrtc/modules/desktop_capture/screen_drawer_unittest.cc @@ -12,7 +12,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/random.h" #include "webrtc/base/timeutils.h" #include "webrtc/system_wrappers/include/logging.h" diff --git a/webrtc/modules/desktop_capture/win/cursor_unittest.cc b/webrtc/modules/desktop_capture/win/cursor_unittest.cc index 4d52f70812..21ea3031e2 100644 --- a/webrtc/modules/desktop_capture/win/cursor_unittest.cc +++ b/webrtc/modules/desktop_capture/win/cursor_unittest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/modules/desktop_capture/desktop_frame.h" #include "webrtc/modules/desktop_capture/desktop_geometry.h" #include "webrtc/modules/desktop_capture/mouse_cursor.h" diff --git a/webrtc/modules/desktop_capture/window_capturer_unittest.cc b/webrtc/modules/desktop_capture/window_capturer_unittest.cc index d2d326e39f..1a8e4d07e7 100644 --- a/webrtc/modules/desktop_capture/window_capturer_unittest.cc +++ b/webrtc/modules/desktop_capture/window_capturer_unittest.cc @@ -12,7 +12,7 @@ #include "webrtc/modules/desktop_capture/window_capturer.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #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" diff --git a/webrtc/modules/media_file/media_file_unittest.cc b/webrtc/modules/media_file/media_file_unittest.cc index 6541a8fb7c..3fa0afcd3d 100644 --- a/webrtc/modules/media_file/media_file_unittest.cc +++ b/webrtc/modules/media_file/media_file_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/media_file/media_file.h" #include "webrtc/system_wrappers/include/sleep.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/module_common_types_unittest.cc b/webrtc/modules/module_common_types_unittest.cc index acd58476a1..148263ceaa 100644 --- a/webrtc/modules/module_common_types_unittest.cc +++ b/webrtc/modules/module_common_types_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/include/module_common_types.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/pacing/bitrate_prober_unittest.cc b/webrtc/modules/pacing/bitrate_prober_unittest.cc index 422bd27b68..e0318dfa10 100644 --- a/webrtc/modules/pacing/bitrate_prober_unittest.cc +++ b/webrtc/modules/pacing/bitrate_prober_unittest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/pacing/bitrate_prober.h" namespace webrtc { diff --git a/webrtc/modules/pacing/mock/mock_paced_sender.h b/webrtc/modules/pacing/mock/mock_paced_sender.h index e429962aed..15f5f0ad5a 100644 --- a/webrtc/modules/pacing/mock/mock_paced_sender.h +++ b/webrtc/modules/pacing/mock/mock_paced_sender.h @@ -13,7 +13,7 @@ #include -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/modules/pacing/paced_sender.h" #include "webrtc/system_wrappers/include/clock.h" diff --git a/webrtc/modules/pacing/paced_sender_unittest.cc b/webrtc/modules/pacing/paced_sender_unittest.cc index 861452567f..4d859c7fc7 100644 --- a/webrtc/modules/pacing/paced_sender_unittest.cc +++ b/webrtc/modules/pacing/paced_sender_unittest.cc @@ -11,8 +11,8 @@ #include #include -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/pacing/paced_sender.h" #include "webrtc/system_wrappers/include/clock.h" diff --git a/webrtc/modules/pacing/packet_router_unittest.cc b/webrtc/modules/pacing/packet_router_unittest.cc index 5c1654e6d0..bfd644dff8 100644 --- a/webrtc/modules/pacing/packet_router_unittest.cc +++ b/webrtc/modules/pacing/packet_router_unittest.cc @@ -12,8 +12,8 @@ #include #include "webrtc/base/checks.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/pacing/packet_router.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" #include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h" diff --git a/webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc b/webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc index d44788be27..b0621efaa7 100644 --- a/webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc +++ b/webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/constructormagic.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test.h" diff --git a/webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h b/webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h index 61773037d7..b65d424f33 100644 --- a/webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h +++ b/webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h @@ -13,7 +13,7 @@ #include -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" namespace webrtc { diff --git a/webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_observer.h b/webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_observer.h index ae05912b5f..8820396ef5 100644 --- a/webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_observer.h +++ b/webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_observer.h @@ -13,7 +13,7 @@ #include -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" namespace webrtc { diff --git a/webrtc/modules/remote_bitrate_estimator/inter_arrival_unittest.cc b/webrtc/modules/remote_bitrate_estimator/inter_arrival_unittest.cc index f255285b63..5ee72d2c2f 100644 --- a/webrtc/modules/remote_bitrate_estimator/inter_arrival_unittest.cc +++ b/webrtc/modules/remote_bitrate_estimator/inter_arrival_unittest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/common_types.h" #include "webrtc/modules/remote_bitrate_estimator/inter_arrival.h" diff --git a/webrtc/modules/remote_bitrate_estimator/overuse_detector_unittest.cc b/webrtc/modules/remote_bitrate_estimator/overuse_detector_unittest.cc index 6f3f3e764e..cfcf2d67ef 100644 --- a/webrtc/modules/remote_bitrate_estimator/overuse_detector_unittest.cc +++ b/webrtc/modules/remote_bitrate_estimator/overuse_detector_unittest.cc @@ -15,7 +15,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/random.h" #include "webrtc/base/rate_statistics.h" 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 4822d40e8b..5a3a52422e 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 @@ -17,7 +17,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/constructormagic.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "webrtc/system_wrappers/include/clock.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 8b8bab48a7..7b831db4dd 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy_unittest.cc +++ b/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/pacing/packet_router.h" #include "webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h" 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 78ee6b7f64..96e6d27043 100644 --- a/webrtc/modules/remote_bitrate_estimator/send_time_history_unittest.cc +++ b/webrtc/modules/remote_bitrate_estimator/send_time_history_unittest.cc @@ -12,7 +12,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/remote_bitrate_estimator/include/send_time_history.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/system_wrappers/include/clock.h" diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test.h b/webrtc/modules/remote_bitrate_estimator/test/bwe_test.h index 5fb3252195..b11ea1a8a6 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test.h +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test.h @@ -14,7 +14,7 @@ #include #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/constructormagic.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe.h" diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc index 254ee0e285..a06838aca0 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc @@ -12,7 +12,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/constructormagic.h" #include "webrtc/modules/remote_bitrate_estimator/test/packet.h" #include "webrtc/modules/remote_bitrate_estimator/test/packet_sender.h" diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_unittest.cc b/webrtc/modules/remote_bitrate_estimator/test/bwe_unittest.cc index 6245ccd25d..c2c87f9bcd 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/bwe_unittest.cc +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_unittest.cc @@ -12,7 +12,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/arraysize.h" namespace webrtc { diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc b/webrtc/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc index 7feaeedf4c..78196dfec8 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc +++ b/webrtc/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc @@ -18,7 +18,7 @@ #include "webrtc/base/common.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h" #include "webrtc/modules/remote_bitrate_estimator/test/packet.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/constructormagic.h" #include "webrtc/modules/remote_bitrate_estimator/test/packet_sender.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/remb.cc b/webrtc/modules/remote_bitrate_estimator/test/estimators/remb.cc index c12b269099..f5a9eafedf 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/estimators/remb.cc +++ b/webrtc/modules/remote_bitrate_estimator/test/estimators/remb.cc @@ -12,7 +12,7 @@ #include "webrtc/modules/remote_bitrate_estimator/test/estimators/remb.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/common.h" #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h" diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/tcp.cc b/webrtc/modules/remote_bitrate_estimator/test/estimators/tcp.cc index b7e4f971fa..e7d3a1025c 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/estimators/tcp.cc +++ b/webrtc/modules/remote_bitrate_estimator/test/estimators/tcp.cc @@ -12,7 +12,7 @@ #include "webrtc/modules/remote_bitrate_estimator/test/estimators/tcp.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/common.h" #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" diff --git a/webrtc/modules/remote_bitrate_estimator/test/metric_recorder_unittest.cc b/webrtc/modules/remote_bitrate_estimator/test/metric_recorder_unittest.cc index 7d4ed5fd5f..e8f291cbeb 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/metric_recorder_unittest.cc +++ b/webrtc/modules/remote_bitrate_estimator/test/metric_recorder_unittest.cc @@ -14,7 +14,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.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 793e06421f..d0be605cc1 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/packet_receiver.cc +++ b/webrtc/modules/remote_bitrate_estimator/test/packet_receiver.cc @@ -12,7 +12,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/common.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe.h" 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 e2755b3994..b312f96f10 100644 --- a/webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter_unittest.cc +++ b/webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter_unittest.cc @@ -12,8 +12,8 @@ #include #include -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/checks.h" #include "webrtc/modules/bitrate_controller/include/mock/mock_bitrate_controller.h" diff --git a/webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h b/webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h index 6834da3985..01f5d820fb 100644 --- a/webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h +++ b/webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h @@ -15,7 +15,7 @@ #include #include -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/modules/include/module.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" diff --git a/webrtc/modules/rtp_rtcp/source/byte_io_unittest.cc b/webrtc/modules/rtp_rtcp/source/byte_io_unittest.cc index 00b63eb65c..6d3327fd7b 100644 --- a/webrtc/modules/rtp_rtcp/source/byte_io_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/byte_io_unittest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/fec_receiver_unittest.cc b/webrtc/modules/rtp_rtcp/source/fec_receiver_unittest.cc index d2e1ce7e6b..fe0abdc386 100644 --- a/webrtc/modules/rtp_rtcp/source/fec_receiver_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/fec_receiver_unittest.cc @@ -13,8 +13,8 @@ #include #include -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/rtp_rtcp/include/fec_receiver.h" #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" #include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h" diff --git a/webrtc/modules/rtp_rtcp/source/mock/mock_rtp_payload_strategy.h b/webrtc/modules/rtp_rtcp/source/mock/mock_rtp_payload_strategy.h index 25b56e7646..e5e9f465a6 100644 --- a/webrtc/modules/rtp_rtcp/source/mock/mock_rtp_payload_strategy.h +++ b/webrtc/modules/rtp_rtcp/source/mock/mock_rtp_payload_strategy.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_MOCK_MOCK_RTP_PAYLOAD_STRATEGY_H_ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_MOCK_MOCK_RTP_PAYLOAD_STRATEGY_H_ -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/nack_rtx_unittest.cc b/webrtc/modules/rtp_rtcp/source/nack_rtx_unittest.cc index 052060cc24..85de6113e3 100644 --- a/webrtc/modules/rtp_rtcp/source/nack_rtx_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/nack_rtx_unittest.cc @@ -14,7 +14,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/rate_limiter.h" #include "webrtc/common_types.h" #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" diff --git a/webrtc/modules/rtp_rtcp/source/packet_loss_stats_unittest.cc b/webrtc/modules/rtp_rtcp/source/packet_loss_stats_unittest.cc index 660628242d..6e7ea033ec 100644 --- a/webrtc/modules/rtp_rtcp/source/packet_loss_stats_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/packet_loss_stats_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/rtp_rtcp/source/packet_loss_stats.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/playout_delay_oracle_unittest.cc b/webrtc/modules/rtp_rtcp/source/playout_delay_oracle_unittest.cc index 17e0185cd5..0d38f3f73e 100644 --- a/webrtc/modules/rtp_rtcp/source/playout_delay_oracle_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/playout_delay_oracle_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/logging.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/producer_fec_unittest.cc b/webrtc/modules/rtp_rtcp/source/producer_fec_unittest.cc index ae51605d68..023a24cced 100644 --- a/webrtc/modules/rtp_rtcp/source/producer_fec_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/producer_fec_unittest.cc @@ -12,7 +12,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/fec_test_helper.h" #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" diff --git a/webrtc/modules/rtp_rtcp/source/receive_statistics_unittest.cc b/webrtc/modules/rtp_rtcp/source/receive_statistics_unittest.cc index f6cbe74e47..c3d7757ae0 100644 --- a/webrtc/modules/rtp_rtcp/source/receive_statistics_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/receive_statistics_unittest.cc @@ -10,8 +10,8 @@ #include -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" #include "webrtc/system_wrappers/include/clock.h" 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 797c7883a9..0103547b43 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 @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/common_types.h" #include "webrtc/modules/rtp_rtcp/include/remote_ntp_time_estimator.h" #include "webrtc/system_wrappers/include/clock.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/app_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/app_unittest.cc index 6015ab8744..91783d0c45 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/app_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/app_unittest.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/rtcp_packet_parser.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/bye_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/bye_unittest.cc index c90566b98d..cc9786744e 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/bye_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/bye_unittest.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/rtcp_packet_parser.h" using testing::ElementsAre; diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header_unittest.cc index d83de1469b..f22422682e 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" using webrtc::rtcp::CommonHeader; diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc index 5e2c7df77d..b42ec0cb49 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/compound_packet.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/fir.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr_unittest.cc index 469a4669bb..bf5756d3f9 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report_unittest.cc index f1ce6a9153..39eb93105e 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report_unittest.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/rtcp_packet_parser.h" using testing::ElementsAre; diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc index 8cb144d844..53b81cf44c 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/random.h" #include "webrtc/test/rtcp_packet_parser.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/fir_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/fir_unittest.cc index bce5f95b75..7680fcbd41 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/fir_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/fir_unittest.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/fir.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/rtcp_packet_parser.h" using testing::AllOf; diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/nack_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/nack_unittest.cc index a9920196c4..f523598c35 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/nack_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/nack_unittest.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/nack.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/rtcp_packet_parser.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/pli_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/pli_unittest.cc index f75182218c..6f32482562 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/pli_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/pli_unittest.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/pli.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/rtcp_packet_parser.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request_unittest.cc index 8dcc46dfd8..5564186fa7 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request_unittest.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/rtcp_packet_parser.h" using testing::ElementsAreArray; diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report_unittest.cc index 5e28ff4f1e..4061db889f 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report_unittest.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/rtcp_packet_parser.h" using testing::ElementsAreArray; diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/remb_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/remb_unittest.cc index af4c5b42c5..f7b1dcf397 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/remb_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/remb_unittest.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/rtcp_packet_parser.h" using testing::ElementsAreArray; diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block_unittest.cc index 957a08ffbf..ab6254b562 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/report_block_unittest.cc @@ -12,7 +12,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/random.h" using webrtc::rtcp::ReportBlock; diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/rpsi_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/rpsi_unittest.cc index 9268e19f2c..14100797e7 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/rpsi_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/rpsi_unittest.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rpsi.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/rtcp_packet_parser.h" using testing::ElementsAreArray; diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/rrtr_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/rrtr_unittest.cc index 6dff06fd3a..70bfe0b8e3 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/rrtr_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/rrtr_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rrtr.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" using webrtc::rtcp::Rrtr; diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes_unittest.cc index 206558a8db..13b28eafef 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/rtcp_packet_parser.h" using webrtc::rtcp::Sdes; diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc index 6611991fbc..d69b53f898 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/rtcp_packet_parser.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/sli_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/sli_unittest.cc index 4b2fdea92b..8468100bb2 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/sli_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/sli_unittest.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sli.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/rtcp_packet_parser.h" using testing::ElementsAreArray; diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn_unittest.cc index e2a3aca43f..c85cc10682 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn_unittest.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/rtcp_packet_parser.h" using testing::ElementsAreArray; diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc index 415ca94c90..012646823c 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/rtcp_packet_parser.h" using testing::ElementsAreArray; diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc index 5387330243..db23c714ea 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc @@ -13,7 +13,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/voip_metric_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/voip_metric_unittest.cc index d12889d7b9..803d41dc40 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/voip_metric_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/voip_metric_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/voip_metric.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { namespace rtcp { diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet_unittest.cc index 082d1c7773..7a5a1912d8 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_packet_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc index 6a393cd785..dd1dc50616 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc @@ -10,8 +10,8 @@ #include -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/array_view.h" #include "webrtc/base/random.h" #include "webrtc/common_types.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc index 60abb6f588..a6ad770af7 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc @@ -10,8 +10,8 @@ #include -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/rate_limiter.h" #include "webrtc/common_types.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_utility_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_utility_unittest.cc index 1a13812f02..92239128d3 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_utility_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtcp_utility_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/checks.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtp_fec_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_fec_unittest.cc index a95c2cb3b0..fd00dc779a 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_fec_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_fec_unittest.cc @@ -12,7 +12,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/basictypes.h" #include "webrtc/base/random.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc index e84d5f959b..a5650f60e4 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc @@ -11,8 +11,8 @@ #include #include -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.cc b/webrtc/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.cc index a62f4969c9..5105659292 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.cc @@ -11,7 +11,7 @@ #include "webrtc/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc index 079d964754..ccaf826457 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc @@ -10,8 +10,8 @@ #include -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/rtp_rtcp/source/rtp_format_vp8.h" #include "webrtc/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc index f9514ad4bd..6a9fe8bdea 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc @@ -11,8 +11,8 @@ #include #include -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtp_header_extension_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_header_extension_unittest.cc index 0b4f893e2c..a8c7664720 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_header_extension_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_header_extension_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/rtp_header_extension.h" 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 05b2311035..ab9b9492d8 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc @@ -12,7 +12,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" #include "webrtc/system_wrappers/include/clock.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc index 010d57bae7..2991aee822 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_packet_unittest.cc @@ -10,8 +10,8 @@ #include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h" #include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/random.h" #include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h" #include "webrtc/modules/rtp_rtcp/source/rtp_header_extension.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtp_payload_registry_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_payload_registry_unittest.cc index 5bbe97a32c..98d074da66 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_payload_registry_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_payload_registry_unittest.cc @@ -12,8 +12,8 @@ #include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/mock/mock_rtp_payload_strategy.h" 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 b43f95d973..5049721bec 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc @@ -12,8 +12,8 @@ #include #include -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/rate_limiter.h" #include "webrtc/common_types.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc index 2cd15963b5..0afa8177ed 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc @@ -11,8 +11,8 @@ #include #include -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/buffer.h" #include "webrtc/base/rate_limiter.h" #include "webrtc/call/mock/mock_rtc_event_log.h" diff --git a/webrtc/modules/rtp_rtcp/source/time_util_unittest.cc b/webrtc/modules/rtp_rtcp/source/time_util_unittest.cc index 8333a64e70..54733b359d 100644 --- a/webrtc/modules/rtp_rtcp/source/time_util_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/time_util_unittest.cc @@ -9,7 +9,7 @@ */ #include "webrtc/modules/rtp_rtcp/source/time_util.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc b/webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc index 9eb2df0478..6edbdb3e22 100644 --- a/webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc @@ -13,7 +13,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/basictypes.h" #include "webrtc/base/checks.h" #include "webrtc/base/random.h" diff --git a/webrtc/modules/rtp_rtcp/source/vp8_partition_aggregator_unittest.cc b/webrtc/modules/rtp_rtcp/source/vp8_partition_aggregator_unittest.cc index 726d83ec50..eb35692870 100644 --- a/webrtc/modules/rtp_rtcp/source/vp8_partition_aggregator_unittest.cc +++ b/webrtc/modules/rtp_rtcp/source/vp8_partition_aggregator_unittest.cc @@ -10,7 +10,7 @@ #include // NULL -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/rtp_rtcp/source/vp8_partition_aggregator.h" namespace webrtc { diff --git a/webrtc/modules/rtp_rtcp/test/testAPI/test_api.h b/webrtc/modules/rtp_rtcp/test/testAPI/test_api.h index 2962dd368f..cbc5f173f0 100644 --- a/webrtc/modules/rtp_rtcp/test/testAPI/test_api.h +++ b/webrtc/modules/rtp_rtcp/test/testAPI/test_api.h @@ -10,7 +10,7 @@ #ifndef WEBRTC_MODULES_RTP_RTCP_TEST_TESTAPI_TEST_API_H_ #define WEBRTC_MODULES_RTP_RTCP_TEST_TESTAPI_TEST_API_H_ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/common_types.h" #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" diff --git a/webrtc/modules/rtp_rtcp/test/testAPI/test_api_audio.cc b/webrtc/modules/rtp_rtcp/test/testAPI/test_api_audio.cc index 291dded3b2..7d72478df0 100644 --- a/webrtc/modules/rtp_rtcp/test/testAPI/test_api_audio.cc +++ b/webrtc/modules/rtp_rtcp/test/testAPI/test_api_audio.cc @@ -11,7 +11,7 @@ #include #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/rtp_rtcp/test/testAPI/test_api.h" diff --git a/webrtc/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc b/webrtc/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc index e19cf35784..cea85dd679 100644 --- a/webrtc/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc +++ b/webrtc/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc @@ -12,8 +12,8 @@ #include #include -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/rate_limiter.h" #include "webrtc/common_types.h" #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" diff --git a/webrtc/modules/rtp_rtcp/test/testAPI/test_api_video.cc b/webrtc/modules/rtp_rtcp/test/testAPI/test_api_video.cc index a701c9e3d7..80ec4ce075 100644 --- a/webrtc/modules/rtp_rtcp/test/testAPI/test_api_video.cc +++ b/webrtc/modules/rtp_rtcp/test/testAPI/test_api_video.cc @@ -14,7 +14,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/rate_limiter.h" #include "webrtc/common_types.h" #include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h" diff --git a/webrtc/modules/rtp_rtcp/test/testFec/test_fec.cc b/webrtc/modules/rtp_rtcp/test/testFec/test_fec.cc index e3368e2b82..971ccc55f4 100644 --- a/webrtc/modules/rtp_rtcp/test/testFec/test_fec.cc +++ b/webrtc/modules/rtp_rtcp/test/testFec/test_fec.cc @@ -18,7 +18,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/random.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" diff --git a/webrtc/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc b/webrtc/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc index 0b4ac25949..edbe15f15e 100644 --- a/webrtc/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc +++ b/webrtc/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc @@ -47,7 +47,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.h" #include "webrtc/modules/rtp_rtcp/test/testFec/average_residual_loss_xor_codes.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/utility/include/mock/mock_process_thread.h b/webrtc/modules/utility/include/mock/mock_process_thread.h index c6520bb20f..6625a74b64 100644 --- a/webrtc/modules/utility/include/mock/mock_process_thread.h +++ b/webrtc/modules/utility/include/mock/mock_process_thread.h @@ -15,7 +15,7 @@ #include "webrtc/modules/utility/include/process_thread.h" -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" namespace webrtc { diff --git a/webrtc/modules/utility/source/audio_frame_operations_unittest.cc b/webrtc/modules/utility/source/audio_frame_operations_unittest.cc index 1d77e8fb89..67ee7987bf 100644 --- a/webrtc/modules/utility/source/audio_frame_operations_unittest.cc +++ b/webrtc/modules/utility/source/audio_frame_operations_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/utility/include/audio_frame_operations.h" diff --git a/webrtc/modules/utility/source/file_player_unittests.cc b/webrtc/modules/utility/source/file_player_unittests.cc index 337c6340b5..8adbdd384b 100644 --- a/webrtc/modules/utility/source/file_player_unittests.cc +++ b/webrtc/modules/utility/source/file_player_unittests.cc @@ -18,7 +18,7 @@ #include #include "gflags/gflags.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/md5digest.h" #include "webrtc/base/stringencode.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/modules/utility/source/helpers_ios.mm b/webrtc/modules/utility/source/helpers_ios.mm index 2afcb2953a..5e827a88d1 100644 --- a/webrtc/modules/utility/source/helpers_ios.mm +++ b/webrtc/modules/utility/source/helpers_ios.mm @@ -178,7 +178,8 @@ int GetProcessorCount() { return [NSProcessInfo processInfo].processorCount; } -#if defined(__IPHONE_9_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_9_0 +#if defined(__IPHONE_9_0) && defined(__IPHONE_OS_VERSION_MAX_ALLOWED) \ + && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_9_0 bool GetLowPowerModeEnabled() { if (isOperatingSystemAtLeastVersion(9.0)) { // lowPoweredModeEnabled is only available on iOS9+. diff --git a/webrtc/modules/utility/source/process_thread_impl_unittest.cc b/webrtc/modules/utility/source/process_thread_impl_unittest.cc index ec3b5a1909..567ed4b025 100644 --- a/webrtc/modules/utility/source/process_thread_impl_unittest.cc +++ b/webrtc/modules/utility/source/process_thread_impl_unittest.cc @@ -11,8 +11,8 @@ #include #include -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/task_queue.h" #include "webrtc/base/timeutils.h" #include "webrtc/modules/include/module.h" diff --git a/webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm b/webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm index a2af4afc0c..10671eb2ae 100644 --- a/webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm +++ b/webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm @@ -47,7 +47,8 @@ using namespace webrtc::videocapturemodule; _owner = owner; _captureId = captureId; _captureSession = [[AVCaptureSession alloc] init]; -#if defined(__IPHONE_7_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_7_0 +#if defined(__IPHONE_7_0) && defined(__IPHONE_OS_VERSION_MAX_ALLOWED) \ + && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_7_0 NSString* version = [[UIDevice currentDevice] systemVersion]; if ([version integerValue] >= 7) { _captureSession.usesApplicationAudioSession = NO; diff --git a/webrtc/modules/video_capture/test/video_capture_main_mac.mm b/webrtc/modules/video_capture/test/video_capture_main_mac.mm index 15cd1d555f..6d6d5c6479 100644 --- a/webrtc/modules/video_capture/test/video_capture_main_mac.mm +++ b/webrtc/modules/video_capture/test/video_capture_main_mac.mm @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/mac/run_threaded_main_mac.h" int ImplementThisToRunYourTest(int argc, char** argv) { diff --git a/webrtc/modules/video_capture/test/video_capture_unittest.cc b/webrtc/modules/video_capture/test/video_capture_unittest.cc index 10f3a2bed3..4cc06cfadf 100644 --- a/webrtc/modules/video_capture/test/video_capture_unittest.cc +++ b/webrtc/modules/video_capture/test/video_capture_unittest.cc @@ -14,7 +14,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/base/timeutils.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" @@ -80,7 +80,7 @@ class TestVideoCaptureCallback : public VideoCaptureDataCallback { CriticalSectionScoped cs(capture_cs_.get()); int height = videoFrame.height(); int width = videoFrame.width(); -#if ANDROID +#if defined(ANDROID) && ANDROID // Android camera frames may be rotated depending on test device // orientation. EXPECT_TRUE(height == capability_.height || height == capability_.width); @@ -337,7 +337,7 @@ TEST_F(VideoCaptureTest, MAYBE_Capabilities) { EXPECT_EQ(0, module->StopCapture()); } -#if ANDROID +#if defined(ANDROID) && ANDROID // There's no reason for this to _necessarily_ be true, but in practice all // Android devices this test runs on in fact do support multiple capture // resolutions and multiple frame-rates per captured resolution, so we assert diff --git a/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_nalu_unittest.cc b/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_nalu_unittest.cc index a263707f4a..44a963e247 100644 --- a/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_nalu_unittest.cc +++ b/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_nalu_unittest.cc @@ -11,7 +11,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/arraysize.h" #include "webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_nalu.h" diff --git a/webrtc/modules/video_coding/codecs/h264/include/h264.h b/webrtc/modules/video_coding/codecs/h264/include/h264.h index 2c404b2cef..54ad6eb09d 100644 --- a/webrtc/modules/video_coding/codecs/h264/include/h264.h +++ b/webrtc/modules/video_coding/codecs/h264/include/h264.h @@ -15,8 +15,8 @@ #if defined(WEBRTC_IOS) || defined(WEBRTC_MAC) #include -#if (defined(__IPHONE_8_0) && \ - __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_8_0) || \ +#if (defined(__IPHONE_8_0) && defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && \ + __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_8_0) || \ (defined(__MAC_10_8) && __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_10_8) #define WEBRTC_VIDEO_TOOLBOX_SUPPORTED 1 #endif diff --git a/webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h b/webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h index cdee8c52ce..c40993d65c 100644 --- a/webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h +++ b/webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h @@ -16,7 +16,7 @@ #include #include -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/video_coding/codecs/test/mock/mock_packet_manipulator.h b/webrtc/modules/video_coding/codecs/test/mock/mock_packet_manipulator.h index 1e2c9b8fb6..4096a93216 100644 --- a/webrtc/modules/video_coding/codecs/test/mock/mock_packet_manipulator.h +++ b/webrtc/modules/video_coding/codecs/test/mock/mock_packet_manipulator.h @@ -15,7 +15,7 @@ #include -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/typedefs.h" #include "webrtc/video_frame.h" diff --git a/webrtc/modules/video_coding/codecs/test/packet_manipulator_unittest.cc b/webrtc/modules/video_coding/codecs/test/packet_manipulator_unittest.cc index 8c3d30dc0d..3b9b17eecc 100644 --- a/webrtc/modules/video_coding/codecs/test/packet_manipulator_unittest.cc +++ b/webrtc/modules/video_coding/codecs/test/packet_manipulator_unittest.cc @@ -12,7 +12,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.h" #include "webrtc/test/testsupport/unittest_utils.h" diff --git a/webrtc/modules/video_coding/codecs/test/stats_unittest.cc b/webrtc/modules/video_coding/codecs/test/stats_unittest.cc index 0403ccfdb3..ed8525214d 100644 --- a/webrtc/modules/video_coding/codecs/test/stats_unittest.cc +++ b/webrtc/modules/video_coding/codecs/test/stats_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/video_coding/codecs/test/stats.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc index cd76aa50a6..214020bc6c 100644 --- a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc +++ b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/modules/video_coding/codecs/test/packet_manipulator.h" diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor_unittest.cc b/webrtc/modules/video_coding/codecs/test/videoprocessor_unittest.cc index 148d8dc74a..77ea472dc6 100644 --- a/webrtc/modules/video_coding/codecs/test/videoprocessor_unittest.cc +++ b/webrtc/modules/video_coding/codecs/test/videoprocessor_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h" #include "webrtc/modules/video_coding/codecs/test/mock/mock_packet_manipulator.h" #include "webrtc/modules/video_coding/codecs/test/videoprocessor.h" diff --git a/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc b/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc index 461ba69a72..2290fe3e4b 100644 --- a/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc +++ b/webrtc/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/modules/video_coding/codecs/vp8/default_temporal_layers.h" diff --git a/webrtc/modules/video_coding/codecs/vp8/reference_picture_selection_unittest.cc b/webrtc/modules/video_coding/codecs/vp8/reference_picture_selection_unittest.cc index 742bb96e91..082634fa10 100644 --- a/webrtc/modules/video_coding/codecs/vp8/reference_picture_selection_unittest.cc +++ b/webrtc/modules/video_coding/codecs/vp8/reference_picture_selection_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "vpx/vpx_encoder.h" #include "vpx/vp8cx.h" #include "webrtc/modules/video_coding/codecs/vp8/reference_picture_selection.h" diff --git a/webrtc/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc b/webrtc/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc index 2711de0adc..b6ffcbaa33 100644 --- a/webrtc/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc +++ b/webrtc/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc @@ -11,7 +11,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "vpx/vpx_encoder.h" #include "vpx/vp8cx.h" #include "webrtc/modules/video_coding/include/video_codec_interface.h" diff --git a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc index d13dbb165b..1fa06f693a 100644 --- a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc +++ b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc @@ -11,7 +11,7 @@ #include #include -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h" #include "webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h" diff --git a/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h b/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h index 4aefb38090..cc14819874 100644 --- a/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h +++ b/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h @@ -15,7 +15,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/checks.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/video_coding/include/mock/mock_video_codec_interface.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 4f3d99b0ec..252eb71210 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 @@ -12,7 +12,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/checks.h" #include "webrtc/base/timeutils.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" 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 dcc061987f..8a374db3bc 100644 --- a/webrtc/modules/video_coding/codecs/vp8/vp8_sequence_coder.cc +++ b/webrtc/modules/video_coding/codecs/vp8/vp8_sequence_coder.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/checks.h" #include "webrtc/base/timeutils.h" #include "webrtc/common_video/include/video_image.h" diff --git a/webrtc/modules/video_coding/codecs/vp9/vp9_screenshare_layers_unittest.cc b/webrtc/modules/video_coding/codecs/vp9/vp9_screenshare_layers_unittest.cc index 4708172962..7038a192f4 100644 --- a/webrtc/modules/video_coding/codecs/vp9/vp9_screenshare_layers_unittest.cc +++ b/webrtc/modules/video_coding/codecs/vp9/vp9_screenshare_layers_unittest.cc @@ -11,7 +11,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "vpx/vp8cx.h" #include "webrtc/base/logging.h" #include "webrtc/modules/video_coding/codecs/vp9/screenshare_layers.h" diff --git a/webrtc/modules/video_coding/decoding_state_unittest.cc b/webrtc/modules/video_coding/decoding_state_unittest.cc index 3942dab72b..5d9733ce68 100644 --- a/webrtc/modules/video_coding/decoding_state_unittest.cc +++ b/webrtc/modules/video_coding/decoding_state_unittest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/video_coding/decoding_state.h" #include "webrtc/modules/video_coding/frame_buffer.h" diff --git a/webrtc/modules/video_coding/frame_buffer2_unittest.cc b/webrtc/modules/video_coding/frame_buffer2_unittest.cc index 46cccad1d6..1397aebb32 100644 --- a/webrtc/modules/video_coding/frame_buffer2_unittest.cc +++ b/webrtc/modules/video_coding/frame_buffer2_unittest.cc @@ -15,8 +15,8 @@ #include #include -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/platform_thread.h" #include "webrtc/base/random.h" #include "webrtc/modules/video_coding/frame_object.h" diff --git a/webrtc/modules/video_coding/histogram_unittest.cc b/webrtc/modules/video_coding/histogram_unittest.cc index ac79ac4afa..c1089ba7f2 100644 --- a/webrtc/modules/video_coding/histogram_unittest.cc +++ b/webrtc/modules/video_coding/histogram_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/video_coding/histogram.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/include/mock/mock_vcm_callbacks.h b/webrtc/modules/video_coding/include/mock/mock_vcm_callbacks.h index 0185dae333..3aefea34b1 100644 --- a/webrtc/modules/video_coding/include/mock/mock_vcm_callbacks.h +++ b/webrtc/modules/video_coding/include/mock/mock_vcm_callbacks.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_INCLUDE_MOCK_MOCK_VCM_CALLBACKS_H_ #define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_MOCK_MOCK_VCM_CALLBACKS_H_ -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/modules/video_coding/include/video_coding_defines.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h b/webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h index 20f76ccb1b..c6665d73ab 100644 --- a/webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h +++ b/webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h @@ -14,7 +14,7 @@ #include #include -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/video_coding/jitter_buffer_unittest.cc b/webrtc/modules/video_coding/jitter_buffer_unittest.cc index 0dc3271ca3..c7108c11d8 100644 --- a/webrtc/modules/video_coding/jitter_buffer_unittest.cc +++ b/webrtc/modules/video_coding/jitter_buffer_unittest.cc @@ -13,8 +13,8 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gtest.h" +#include "webrtc/test/gmock.h" #include "webrtc/modules/video_coding/frame_buffer.h" #include "webrtc/modules/video_coding/jitter_buffer.h" #include "webrtc/modules/video_coding/media_opt_util.h" diff --git a/webrtc/modules/video_coding/jitter_estimator_tests.cc b/webrtc/modules/video_coding/jitter_estimator_tests.cc index 3d46ce2bcd..1a9afbf820 100644 --- a/webrtc/modules/video_coding/jitter_estimator_tests.cc +++ b/webrtc/modules/video_coding/jitter_estimator_tests.cc @@ -9,7 +9,7 @@ #include "webrtc/modules/video_coding/jitter_estimator.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/nack_module_unittest.cc b/webrtc/modules/video_coding/nack_module_unittest.cc index 9c2eb4ac0c..b11a4ad473 100644 --- a/webrtc/modules/video_coding/nack_module_unittest.cc +++ b/webrtc/modules/video_coding/nack_module_unittest.cc @@ -11,7 +11,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/video_coding/include/video_coding_defines.h" #include "webrtc/modules/video_coding/nack_module.h" #include "webrtc/system_wrappers/include/clock.h" diff --git a/webrtc/modules/video_coding/percentile_filter_unittest.cc b/webrtc/modules/video_coding/percentile_filter_unittest.cc index 8029bdbe19..1e1fa96cfb 100644 --- a/webrtc/modules/video_coding/percentile_filter_unittest.cc +++ b/webrtc/modules/video_coding/percentile_filter_unittest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/constructormagic.h" #include "webrtc/modules/video_coding/percentile_filter.h" diff --git a/webrtc/modules/video_coding/protection_bitrate_calculator_unittest.cc b/webrtc/modules/video_coding/protection_bitrate_calculator_unittest.cc index 151873a6df..b442bba6b2 100644 --- a/webrtc/modules/video_coding/protection_bitrate_calculator_unittest.cc +++ b/webrtc/modules/video_coding/protection_bitrate_calculator_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/video_coding/protection_bitrate_calculator.h" #include "webrtc/system_wrappers/include/clock.h" diff --git a/webrtc/modules/video_coding/receiver_unittest.cc b/webrtc/modules/video_coding/receiver_unittest.cc index b2a3a361e7..86ce036b4f 100644 --- a/webrtc/modules/video_coding/receiver_unittest.cc +++ b/webrtc/modules/video_coding/receiver_unittest.cc @@ -14,7 +14,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/checks.h" #include "webrtc/modules/video_coding/encoded_frame.h" #include "webrtc/modules/video_coding/packet.h" diff --git a/webrtc/modules/video_coding/rtp_frame_reference_finder_unittest.cc b/webrtc/modules/video_coding/rtp_frame_reference_finder_unittest.cc index 1efd1c35b9..606295fbc9 100644 --- a/webrtc/modules/video_coding/rtp_frame_reference_finder_unittest.cc +++ b/webrtc/modules/video_coding/rtp_frame_reference_finder_unittest.cc @@ -14,7 +14,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/random.h" #include "webrtc/base/refcount.h" #include "webrtc/modules/video_coding/frame_object.h" diff --git a/webrtc/modules/video_coding/sequence_number_util_unittest.cc b/webrtc/modules/video_coding/sequence_number_util_unittest.cc index 8028efde2f..41743358f3 100644 --- a/webrtc/modules/video_coding/sequence_number_util_unittest.cc +++ b/webrtc/modules/video_coding/sequence_number_util_unittest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/video_coding/sequence_number_util.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/session_info_unittest.cc b/webrtc/modules/video_coding/session_info_unittest.cc index 4019d63a5f..2cdc25f600 100644 --- a/webrtc/modules/video_coding/session_info_unittest.cc +++ b/webrtc/modules/video_coding/session_info_unittest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/video_coding/packet.h" #include "webrtc/modules/video_coding/session_info.h" diff --git a/webrtc/modules/video_coding/test/stream_generator.cc b/webrtc/modules/video_coding/test/stream_generator.cc index 167d55faff..b9bd51a2a3 100644 --- a/webrtc/modules/video_coding/test/stream_generator.cc +++ b/webrtc/modules/video_coding/test/stream_generator.cc @@ -14,7 +14,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/video_coding/packet.h" #include "webrtc/modules/video_coding/test/test_util.h" #include "webrtc/system_wrappers/include/clock.h" diff --git a/webrtc/modules/video_coding/timing_unittest.cc b/webrtc/modules/video_coding/timing_unittest.cc index 3e3b642416..88fb3d71a8 100644 --- a/webrtc/modules/video_coding/timing_unittest.cc +++ b/webrtc/modules/video_coding/timing_unittest.cc @@ -12,7 +12,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/video_coding/include/video_coding.h" #include "webrtc/modules/video_coding/internal_defines.h" diff --git a/webrtc/modules/video_coding/utility/frame_dropper_unittest.cc b/webrtc/modules/video_coding/utility/frame_dropper_unittest.cc index 16635433fc..b5e2f45971 100644 --- a/webrtc/modules/video_coding/utility/frame_dropper_unittest.cc +++ b/webrtc/modules/video_coding/utility/frame_dropper_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/video_coding/utility/frame_dropper.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/logging.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/utility/h264_bitstream_parser_unittest.cc b/webrtc/modules/video_coding/utility/h264_bitstream_parser_unittest.cc index ebc4467544..fbacd3b9ed 100644 --- a/webrtc/modules/video_coding/utility/h264_bitstream_parser_unittest.cc +++ b/webrtc/modules/video_coding/utility/h264_bitstream_parser_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/video_coding/utility/h264_bitstream_parser.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/utility/ivf_file_writer_unittest.cc b/webrtc/modules/video_coding/utility/ivf_file_writer_unittest.cc index e5da48c659..e4017d191b 100644 --- a/webrtc/modules/video_coding/utility/ivf_file_writer_unittest.cc +++ b/webrtc/modules/video_coding/utility/ivf_file_writer_unittest.cc @@ -12,7 +12,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/helpers.h" #include "webrtc/base/logging.h" #include "webrtc/base/thread.h" diff --git a/webrtc/modules/video_coding/utility/mock/mock_frame_dropper.h b/webrtc/modules/video_coding/utility/mock/mock_frame_dropper.h index b68a4b8d5d..d339922ab4 100644 --- a/webrtc/modules/video_coding/utility/mock/mock_frame_dropper.h +++ b/webrtc/modules/video_coding/utility/mock/mock_frame_dropper.h @@ -12,7 +12,7 @@ #include -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/modules/video_coding/utility/frame_dropper.h" #include "webrtc/typedefs.h" diff --git a/webrtc/modules/video_coding/utility/moving_average_unittest.cc b/webrtc/modules/video_coding/utility/moving_average_unittest.cc index fa32a45e46..77c3adf1c5 100644 --- a/webrtc/modules/video_coding/utility/moving_average_unittest.cc +++ b/webrtc/modules/video_coding/utility/moving_average_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/video_coding/utility/moving_average.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" TEST(MovingAverageTest, EmptyAverage) { webrtc::MovingAverage moving_average(1); diff --git a/webrtc/modules/video_coding/utility/quality_scaler_unittest.cc b/webrtc/modules/video_coding/utility/quality_scaler_unittest.cc index 2bbd26d760..24d5c48d38 100644 --- a/webrtc/modules/video_coding/utility/quality_scaler_unittest.cc +++ b/webrtc/modules/video_coding/utility/quality_scaler_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/modules/video_coding/utility/quality_scaler.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { namespace { diff --git a/webrtc/modules/video_coding/utility/simulcast_rate_allocator_unittest.cc b/webrtc/modules/video_coding/utility/simulcast_rate_allocator_unittest.cc index a4af36f6d2..7a616d948a 100644 --- a/webrtc/modules/video_coding/utility/simulcast_rate_allocator_unittest.cc +++ b/webrtc/modules/video_coding/utility/simulcast_rate_allocator_unittest.cc @@ -13,7 +13,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { namespace { diff --git a/webrtc/modules/video_coding/video_coding_robustness_unittest.cc b/webrtc/modules/video_coding/video_coding_robustness_unittest.cc index b8e0f5d764..fd3b50be10 100644 --- a/webrtc/modules/video_coding/video_coding_robustness_unittest.cc +++ b/webrtc/modules/video_coding/video_coding_robustness_unittest.cc @@ -10,8 +10,8 @@ #include -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h" #include "webrtc/modules/video_coding/include/mock/mock_vcm_callbacks.h" #include "webrtc/modules/video_coding/include/video_coding.h" diff --git a/webrtc/modules/video_coding/video_packet_buffer_unittest.cc b/webrtc/modules/video_coding/video_packet_buffer_unittest.cc index f4ae5c7508..53b7a573d9 100644 --- a/webrtc/modules/video_coding/video_packet_buffer_unittest.cc +++ b/webrtc/modules/video_coding/video_packet_buffer_unittest.cc @@ -13,7 +13,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/random.h" #include "webrtc/modules/video_coding/frame_object.h" #include "webrtc/modules/video_coding/packet_buffer.h" diff --git a/webrtc/modules/video_coding/video_receiver_unittest.cc b/webrtc/modules/video_coding/video_receiver_unittest.cc index 3c414053bc..f3c1ccc009 100644 --- a/webrtc/modules/video_coding/video_receiver_unittest.cc +++ b/webrtc/modules/video_coding/video_receiver_unittest.cc @@ -11,7 +11,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h" #include "webrtc/modules/video_coding/include/mock/mock_vcm_callbacks.h" #include "webrtc/modules/video_coding/include/video_coding.h" diff --git a/webrtc/modules/video_coding/video_sender_unittest.cc b/webrtc/modules/video_coding/video_sender_unittest.cc index a3766c1d64..b5ffabf3e1 100644 --- a/webrtc/modules/video_coding/video_sender_unittest.cc +++ b/webrtc/modules/video_coding/video_sender_unittest.cc @@ -11,7 +11,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h" diff --git a/webrtc/modules/video_processing/test/video_processing_unittest.h b/webrtc/modules/video_processing/test/video_processing_unittest.h index 6edd72e2fe..92e91380e7 100644 --- a/webrtc/modules/video_processing/test/video_processing_unittest.h +++ b/webrtc/modules/video_processing/test/video_processing_unittest.h @@ -13,7 +13,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/video_processing/include/video_processing.h" #include "webrtc/system_wrappers/include/trace.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/sdk/objc/Framework/Classes/avfoundationvideocapturer.mm b/webrtc/sdk/objc/Framework/Classes/avfoundationvideocapturer.mm index 5708346ae2..115f7f847a 100644 --- a/webrtc/sdk/objc/Framework/Classes/avfoundationvideocapturer.mm +++ b/webrtc/sdk/objc/Framework/Classes/avfoundationvideocapturer.mm @@ -304,7 +304,8 @@ static NSString *GetSessionPresetForVideoFormat( - (void)handleCaptureSessionInterruption:(NSNotification *)notification { NSString *reasonString = nil; -#if defined(__IPHONE_9_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_9_0 +#if defined(__IPHONE_9_0) && defined(__IPHONE_OS_VERSION_MAX_ALLOWED) \ + && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_9_0 NSNumber *reason = notification.userInfo[AVCaptureSessionInterruptionReasonKey]; if (reason) { @@ -411,7 +412,8 @@ static NSString *GetSessionPresetForVideoFormat( - (BOOL)setupCaptureSession { AVCaptureSession *captureSession = [[AVCaptureSession alloc] init]; -#if defined(__IPHONE_7_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_7_0 +#if defined(__IPHONE_7_0) && defined(__IPHONE_OS_VERSION_MAX_ALLOWED) \ + && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_7_0 NSString *version = [[UIDevice currentDevice] systemVersion]; if ([version integerValue] >= 7) { captureSession.usesApplicationAudioSession = NO; diff --git a/webrtc/system_wrappers/source/aligned_array_unittest.cc b/webrtc/system_wrappers/source/aligned_array_unittest.cc index 01238f8342..5f3cdf7427 100644 --- a/webrtc/system_wrappers/source/aligned_array_unittest.cc +++ b/webrtc/system_wrappers/source/aligned_array_unittest.cc @@ -12,7 +12,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace { diff --git a/webrtc/system_wrappers/source/aligned_malloc.cc b/webrtc/system_wrappers/source/aligned_malloc.cc index a654e97e75..f700f8b1f1 100644 --- a/webrtc/system_wrappers/source/aligned_malloc.cc +++ b/webrtc/system_wrappers/source/aligned_malloc.cc @@ -13,7 +13,7 @@ #include #include -#if _WIN32 +#ifdef _WIN32 #include #else #include diff --git a/webrtc/system_wrappers/source/aligned_malloc_unittest.cc b/webrtc/system_wrappers/source/aligned_malloc_unittest.cc index ed6cd424db..fbd5d6e1f6 100644 --- a/webrtc/system_wrappers/source/aligned_malloc_unittest.cc +++ b/webrtc/system_wrappers/source/aligned_malloc_unittest.cc @@ -12,13 +12,13 @@ #include -#if _WIN32 +#ifdef _WIN32 #include #else #include #endif -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/typedefs.h" namespace webrtc { diff --git a/webrtc/system_wrappers/source/clock_unittest.cc b/webrtc/system_wrappers/source/clock_unittest.cc index 9cb8ec73d0..76507ce3f3 100644 --- a/webrtc/system_wrappers/source/clock_unittest.cc +++ b/webrtc/system_wrappers/source/clock_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/system_wrappers/include/clock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/system_wrappers/source/condition_variable_unittest.cc b/webrtc/system_wrappers/source/condition_variable_unittest.cc index 5fc6bc6b73..ac61b5c3fa 100644 --- a/webrtc/system_wrappers/source/condition_variable_unittest.cc +++ b/webrtc/system_wrappers/source/condition_variable_unittest.cc @@ -15,7 +15,7 @@ #include "webrtc/system_wrappers/source/condition_variable_event_win.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/platform_thread.h" #include "webrtc/base/timeutils.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" diff --git a/webrtc/system_wrappers/source/critical_section_unittest.cc b/webrtc/system_wrappers/source/critical_section_unittest.cc index 9abf8b8017..0e9f8c82a0 100644 --- a/webrtc/system_wrappers/source/critical_section_unittest.cc +++ b/webrtc/system_wrappers/source/critical_section_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/system_wrappers/include/critical_section_wrapper.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/system_wrappers/include/sleep.h" #include "webrtc/base/platform_thread.h" #include "webrtc/system_wrappers/include/trace.h" diff --git a/webrtc/system_wrappers/source/data_log_helpers_unittest.cc b/webrtc/system_wrappers/source/data_log_helpers_unittest.cc index 25e1827ddb..1cf718755a 100644 --- a/webrtc/system_wrappers/source/data_log_helpers_unittest.cc +++ b/webrtc/system_wrappers/source/data_log_helpers_unittest.cc @@ -12,7 +12,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" using ::webrtc::DataLog; diff --git a/webrtc/system_wrappers/source/data_log_unittest.cc b/webrtc/system_wrappers/source/data_log_unittest.cc index 53f201ca5f..8fb01bca27 100644 --- a/webrtc/system_wrappers/source/data_log_unittest.cc +++ b/webrtc/system_wrappers/source/data_log_unittest.cc @@ -13,7 +13,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/system_wrappers/include/data_log_c.h" #include "webrtc/system_wrappers/source/data_log_c_helpers_unittest.h" diff --git a/webrtc/system_wrappers/source/data_log_unittest_disabled.cc b/webrtc/system_wrappers/source/data_log_unittest_disabled.cc index 1855a3e74f..c06648e393 100644 --- a/webrtc/system_wrappers/source/data_log_unittest_disabled.cc +++ b/webrtc/system_wrappers/source/data_log_unittest_disabled.cc @@ -12,7 +12,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" using ::webrtc::DataLog; diff --git a/webrtc/system_wrappers/source/event_timer_posix_unittest.cc b/webrtc/system_wrappers/source/event_timer_posix_unittest.cc index 4f4514dbcc..47ef47e8ff 100644 --- a/webrtc/system_wrappers/source/event_timer_posix_unittest.cc +++ b/webrtc/system_wrappers/source/event_timer_posix_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/system_wrappers/source/event_timer_posix.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/event.h" #include "webrtc/base/criticalsection.h" diff --git a/webrtc/system_wrappers/source/logging_unittest.cc b/webrtc/system_wrappers/source/logging_unittest.cc index 118c3425bf..b7318da1ad 100644 --- a/webrtc/system_wrappers/source/logging_unittest.cc +++ b/webrtc/system_wrappers/source/logging_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/system_wrappers/include/logging.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/arraysize.h" #include "webrtc/base/event.h" #include "webrtc/system_wrappers/include/trace.h" diff --git a/webrtc/system_wrappers/source/metrics_default_unittest.cc b/webrtc/system_wrappers/source/metrics_default_unittest.cc index c130a8c93e..4ffb4c264a 100644 --- a/webrtc/system_wrappers/source/metrics_default_unittest.cc +++ b/webrtc/system_wrappers/source/metrics_default_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/system_wrappers/include/metrics.h" #include "webrtc/system_wrappers/include/metrics_default.h" diff --git a/webrtc/system_wrappers/source/metrics_unittest.cc b/webrtc/system_wrappers/source/metrics_unittest.cc index 1d7888fbbd..54942241d9 100644 --- a/webrtc/system_wrappers/source/metrics_unittest.cc +++ b/webrtc/system_wrappers/source/metrics_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/system_wrappers/include/metrics.h" #include "webrtc/system_wrappers/include/metrics_default.h" diff --git a/webrtc/system_wrappers/source/ntp_time_unittest.cc b/webrtc/system_wrappers/source/ntp_time_unittest.cc index ff11288c1b..50943aede2 100644 --- a/webrtc/system_wrappers/source/ntp_time_unittest.cc +++ b/webrtc/system_wrappers/source/ntp_time_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/system_wrappers/include/ntp_time.h" diff --git a/webrtc/system_wrappers/source/rtp_to_ntp_unittest.cc b/webrtc/system_wrappers/source/rtp_to_ntp_unittest.cc index 78e4a52716..0e81e4d867 100644 --- a/webrtc/system_wrappers/source/rtp_to_ntp_unittest.cc +++ b/webrtc/system_wrappers/source/rtp_to_ntp_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/system_wrappers/include/rtp_to_ntp.h" namespace webrtc { diff --git a/webrtc/system_wrappers/source/stl_util_unittest.cc b/webrtc/system_wrappers/source/stl_util_unittest.cc index ed5c1d9590..d75e44a052 100644 --- a/webrtc/system_wrappers/source/stl_util_unittest.cc +++ b/webrtc/system_wrappers/source/stl_util_unittest.cc @@ -13,7 +13,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace { diff --git a/webrtc/system_wrappers/source/stringize_macros_unittest.cc b/webrtc/system_wrappers/source/stringize_macros_unittest.cc index c2f312bf90..8b103c5d39 100644 --- a/webrtc/system_wrappers/source/stringize_macros_unittest.cc +++ b/webrtc/system_wrappers/source/stringize_macros_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/system_wrappers/include/stringize_macros.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" // Macros as per documentation in header file. #define PREPROCESSOR_UTIL_UNITTEST_A FOO diff --git a/webrtc/test/BUILD.gn b/webrtc/test/BUILD.gn index 249c78cce4..94cf7bed29 100644 --- a/webrtc/test/BUILD.gn +++ b/webrtc/test/BUILD.gn @@ -106,6 +106,8 @@ rtc_source_set("test_support") { testonly = true sources = [ + "gmock.h", + "gtest.h", "testsupport/fileutils.cc", "testsupport/fileutils.h", "testsupport/frame_reader.cc", @@ -127,6 +129,7 @@ rtc_source_set("test_support") { deps = [ "../base:gtest_prod", + "../base:rtc_base_approved", "../common_video", "../system_wrappers", "//testing/gmock", diff --git a/webrtc/test/DEPS b/webrtc/test/DEPS index e8ed18bc6a..969a10c67e 100644 --- a/webrtc/test/DEPS +++ b/webrtc/test/DEPS @@ -12,3 +12,12 @@ include_rules = [ "+webrtc/system_wrappers", "+webrtc/voice_engine", ] + +specific_include_rules = { + "gmock\.h": [ + "+testing/gmock/include/gmock", + ], + "gtest\.h": [ + "+testing/gtest/include/gtest", + ], +} diff --git a/webrtc/test/configurable_frame_size_encoder.cc b/webrtc/test/configurable_frame_size_encoder.cc index 831e481bd8..1453418c11 100644 --- a/webrtc/test/configurable_frame_size_encoder.cc +++ b/webrtc/test/configurable_frame_size_encoder.cc @@ -12,7 +12,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/common_video/include/video_image.h" #include "webrtc/modules/video_coding/include/video_codec_interface.h" diff --git a/webrtc/test/direct_transport.cc b/webrtc/test/direct_transport.cc index 591e154b14..28a67a4bd6 100644 --- a/webrtc/test/direct_transport.cc +++ b/webrtc/test/direct_transport.cc @@ -9,7 +9,7 @@ */ #include "webrtc/test/direct_transport.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/call.h" #include "webrtc/system_wrappers/include/clock.h" diff --git a/webrtc/test/fake_audio_device.cc b/webrtc/test/fake_audio_device.cc index 43c2933ba7..220755f02e 100644 --- a/webrtc/test/fake_audio_device.cc +++ b/webrtc/test/fake_audio_device.cc @@ -12,7 +12,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/platform_thread.h" #include "webrtc/modules/media_file/media_file_utility.h" #include "webrtc/system_wrappers/include/clock.h" diff --git a/webrtc/test/fake_decoder.cc b/webrtc/test/fake_decoder.cc index ef8f8879ae..103b41ce56 100644 --- a/webrtc/test/fake_decoder.cc +++ b/webrtc/test/fake_decoder.cc @@ -10,7 +10,7 @@ #include "webrtc/test/fake_decoder.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { namespace test { diff --git a/webrtc/test/fake_encoder.cc b/webrtc/test/fake_encoder.cc index d015ab8913..3a9ae4ec3c 100644 --- a/webrtc/test/fake_encoder.cc +++ b/webrtc/test/fake_encoder.cc @@ -12,7 +12,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/checks.h" #include "webrtc/modules/video_coding/include/video_codec_interface.h" diff --git a/webrtc/test/fake_network_pipe_unittest.cc b/webrtc/test/fake_network_pipe_unittest.cc index fcc0c935d0..fa58bf5174 100644 --- a/webrtc/test/fake_network_pipe_unittest.cc +++ b/webrtc/test/fake_network_pipe_unittest.cc @@ -10,8 +10,8 @@ #include -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/call.h" #include "webrtc/system_wrappers/include/clock.h" diff --git a/webrtc/test/frame_generator_unittest.cc b/webrtc/test/frame_generator_unittest.cc index b375d040ff..4b90458882 100644 --- a/webrtc/test/frame_generator_unittest.cc +++ b/webrtc/test/frame_generator_unittest.cc @@ -13,7 +13,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/frame_generator.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/test/gmock.h b/webrtc/test/gmock.h new file mode 100644 index 0000000000..bc12fb91d1 --- /dev/null +++ b/webrtc/test/gmock.h @@ -0,0 +1,20 @@ +/* + * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +#ifndef WEBRTC_TEST_GMOCK_H_ +#define WEBRTC_TEST_GMOCK_H_ + +#include "webrtc/base/ignore_wundef.h" + +RTC_PUSH_IGNORING_WUNDEF() +#include "testing/gmock/include/gmock/gmock.h" +RTC_POP_IGNORING_WUNDEF() + +#endif // WEBRTC_TEST_GMOCK_H_ diff --git a/webrtc/test/gtest.h b/webrtc/test/gtest.h new file mode 100644 index 0000000000..2d222cc22c --- /dev/null +++ b/webrtc/test/gtest.h @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +#ifndef WEBRTC_TEST_GTEST_H_ +#define WEBRTC_TEST_GTEST_H_ + +#include "webrtc/base/ignore_wundef.h" + +RTC_PUSH_IGNORING_WUNDEF() +#include "testing/gtest/include/gtest/gtest.h" +RTC_POP_IGNORING_WUNDEF() + +// GTEST_HAS_DEATH_TEST is set to 1 when death tests are supported, but appears +// to be left unset if they're not supported. Rather than depend on this, we +// set it to 0 ourselves here. +#ifndef GTEST_HAS_DEATH_TEST +#define GTEST_HAS_DEATH_TEST 0 +#endif + +#endif // WEBRTC_TEST_GTEST_H_ diff --git a/webrtc/test/mock_transport.h b/webrtc/test/mock_transport.h index 4937134512..37a72b3126 100644 --- a/webrtc/test/mock_transport.h +++ b/webrtc/test/mock_transport.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_TEST_MOCK_TRANSPORT_H_ #define WEBRTC_TEST_MOCK_TRANSPORT_H_ -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/transport.h" namespace webrtc { diff --git a/webrtc/test/mock_voe_channel_proxy.h b/webrtc/test/mock_voe_channel_proxy.h index 069b4f1c78..40fee1beb0 100644 --- a/webrtc/test/mock_voe_channel_proxy.h +++ b/webrtc/test/mock_voe_channel_proxy.h @@ -12,7 +12,7 @@ #define WEBRTC_TEST_MOCK_VOE_CHANNEL_PROXY_H_ #include -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/voice_engine/channel_proxy.h" namespace webrtc { diff --git a/webrtc/test/mock_voice_engine.h b/webrtc/test/mock_voice_engine.h index 4118977c0b..85d27bd8d0 100644 --- a/webrtc/test/mock_voice_engine.h +++ b/webrtc/test/mock_voice_engine.h @@ -13,7 +13,7 @@ #include -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/test/mock_voe_channel_proxy.h" #include "webrtc/voice_engine/voice_engine_impl.h" diff --git a/webrtc/test/rtp_file_reader_unittest.cc b/webrtc/test/rtp_file_reader_unittest.cc index fceac3836d..0a0d676531 100644 --- a/webrtc/test/rtp_file_reader_unittest.cc +++ b/webrtc/test/rtp_file_reader_unittest.cc @@ -11,7 +11,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" #include "webrtc/test/rtp_file_reader.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/test/rtp_file_writer_unittest.cc b/webrtc/test/rtp_file_writer_unittest.cc index 3287f976c6..fa7d79d039 100644 --- a/webrtc/test/rtp_file_writer_unittest.cc +++ b/webrtc/test/rtp_file_writer_unittest.cc @@ -12,7 +12,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/rtp_file_reader.h" #include "webrtc/test/rtp_file_writer.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/test/rtp_rtcp_observer.h b/webrtc/test/rtp_rtcp_observer.h index ab86561167..72bcdda7a9 100644 --- a/webrtc/test/rtp_rtcp_observer.h +++ b/webrtc/test/rtp_rtcp_observer.h @@ -14,7 +14,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/criticalsection.h" #include "webrtc/base/event.h" diff --git a/webrtc/test/test.gyp b/webrtc/test/test.gyp index ae36da8ffe..1d476a96c6 100644 --- a/webrtc/test/test.gyp +++ b/webrtc/test/test.gyp @@ -78,10 +78,13 @@ '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/testing/gmock.gyp:gmock', '<(webrtc_root)/base/base.gyp:gtest_prod', + '<(webrtc_root)/base/base.gyp:rtc_base_approved', '<(webrtc_root)/common_video/common_video.gyp:common_video', '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', ], 'sources': [ + 'gmock.h', + 'gtest.h', 'testsupport/fileutils.cc', 'testsupport/fileutils.h', 'testsupport/frame_reader.cc', diff --git a/webrtc/test/test_main.cc b/webrtc/test/test_main.cc index a92ad9f5e6..df7a82fb0c 100644 --- a/webrtc/test/test_main.cc +++ b/webrtc/test/test_main.cc @@ -9,7 +9,7 @@ */ #include "gflags/gflags.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/logging.h" #include "webrtc/system_wrappers/include/metrics_default.h" #include "webrtc/test/field_trial.h" diff --git a/webrtc/test/test_suite.cc b/webrtc/test/test_suite.cc index 69e4a57508..174de020fd 100644 --- a/webrtc/test/test_suite.cc +++ b/webrtc/test/test_suite.cc @@ -11,8 +11,8 @@ #include "webrtc/test/test_suite.h" #include "gflags/gflags.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/logging.h" #include "webrtc/system_wrappers/include/metrics_default.h" #include "webrtc/test/testsupport/fileutils.h" diff --git a/webrtc/test/testsupport/always_passing_unittest.cc b/webrtc/test/testsupport/always_passing_unittest.cc index afb80e662c..79a4869918 100644 --- a/webrtc/test/testsupport/always_passing_unittest.cc +++ b/webrtc/test/testsupport/always_passing_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/test/testsupport/fileutils_unittest.cc b/webrtc/test/testsupport/fileutils_unittest.cc index e205db3ecf..2677b8c4bb 100644 --- a/webrtc/test/testsupport/fileutils_unittest.cc +++ b/webrtc/test/testsupport/fileutils_unittest.cc @@ -15,7 +15,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #ifdef WIN32 #define chdir _chdir diff --git a/webrtc/test/testsupport/frame_reader_unittest.cc b/webrtc/test/testsupport/frame_reader_unittest.cc index 25ea9132f2..8b16926b5e 100644 --- a/webrtc/test/testsupport/frame_reader_unittest.cc +++ b/webrtc/test/testsupport/frame_reader_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/test/testsupport/frame_reader.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" namespace webrtc { diff --git a/webrtc/test/testsupport/frame_writer_unittest.cc b/webrtc/test/testsupport/frame_writer_unittest.cc index da1e268662..59173bdfaa 100644 --- a/webrtc/test/testsupport/frame_writer_unittest.cc +++ b/webrtc/test/testsupport/frame_writer_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/test/testsupport/frame_writer.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" namespace webrtc { diff --git a/webrtc/test/testsupport/metrics/video_metrics_unittest.cc b/webrtc/test/testsupport/metrics/video_metrics_unittest.cc index 0958dcfbad..83a34a3985 100644 --- a/webrtc/test/testsupport/metrics/video_metrics_unittest.cc +++ b/webrtc/test/testsupport/metrics/video_metrics_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/test/testsupport/metrics/video_metrics.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" namespace webrtc { diff --git a/webrtc/test/testsupport/mock/mock_frame_reader.h b/webrtc/test/testsupport/mock/mock_frame_reader.h index f06750ef4a..8d1c66998c 100644 --- a/webrtc/test/testsupport/mock/mock_frame_reader.h +++ b/webrtc/test/testsupport/mock/mock_frame_reader.h @@ -13,7 +13,7 @@ #include "webrtc/test/testsupport/frame_reader.h" -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" namespace webrtc { namespace test { diff --git a/webrtc/test/testsupport/mock/mock_frame_writer.h b/webrtc/test/testsupport/mock/mock_frame_writer.h index 10f58fb47b..8ba96bcf08 100644 --- a/webrtc/test/testsupport/mock/mock_frame_writer.h +++ b/webrtc/test/testsupport/mock/mock_frame_writer.h @@ -13,7 +13,7 @@ #include "webrtc/test/testsupport/frame_writer.h" -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" namespace webrtc { namespace test { diff --git a/webrtc/test/testsupport/packet_reader_unittest.cc b/webrtc/test/testsupport/packet_reader_unittest.cc index 2679be473f..ded1db39dd 100644 --- a/webrtc/test/testsupport/packet_reader_unittest.cc +++ b/webrtc/test/testsupport/packet_reader_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/test/testsupport/packet_reader.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/unittest_utils.h" namespace webrtc { diff --git a/webrtc/test/testsupport/perf_test_unittest.cc b/webrtc/test/testsupport/perf_test_unittest.cc index f7e50e1bc6..4516b99e59 100644 --- a/webrtc/test/testsupport/perf_test_unittest.cc +++ b/webrtc/test/testsupport/perf_test_unittest.cc @@ -12,7 +12,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" namespace webrtc { namespace test { diff --git a/webrtc/tools/agc/activity_metric.cc b/webrtc/tools/agc/activity_metric.cc index c3b46cae7a..7eac140a48 100644 --- a/webrtc/tools/agc/activity_metric.cc +++ b/webrtc/tools/agc/activity_metric.cc @@ -17,7 +17,7 @@ #include #include "gflags/gflags.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_processing/agc/agc.h" #include "webrtc/modules/audio_processing/agc/loudness_histogram.h" #include "webrtc/modules/audio_processing/agc/utility.h" diff --git a/webrtc/tools/event_log_visualizer/plot_protobuf.h b/webrtc/tools/event_log_visualizer/plot_protobuf.h index 2008a228e3..f80ff49e98 100644 --- a/webrtc/tools/event_log_visualizer/plot_protobuf.h +++ b/webrtc/tools/event_log_visualizer/plot_protobuf.h @@ -10,7 +10,10 @@ #ifndef WEBRTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PROTOBUF_H_ #define WEBRTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PROTOBUF_H_ +#include "webrtc/base/ignore_wundef.h" +RTC_PUSH_IGNORING_WUNDEF() #include "webrtc/tools/event_log_visualizer/chart.pb.h" +RTC_POP_IGNORING_WUNDEF() #include "webrtc/tools/event_log_visualizer/plot_base.h" namespace webrtc { diff --git a/webrtc/tools/frame_analyzer/video_quality_analysis_unittest.cc b/webrtc/tools/frame_analyzer/video_quality_analysis_unittest.cc index 85fd11892c..f8a4b6979f 100644 --- a/webrtc/tools/frame_analyzer/video_quality_analysis_unittest.cc +++ b/webrtc/tools/frame_analyzer/video_quality_analysis_unittest.cc @@ -14,7 +14,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/tools/frame_analyzer/video_quality_analysis.h" diff --git a/webrtc/tools/frame_editing/frame_editing_unittest.cc b/webrtc/tools/frame_editing/frame_editing_unittest.cc index e1ba1de0fc..c06829641b 100644 --- a/webrtc/tools/frame_editing/frame_editing_unittest.cc +++ b/webrtc/tools/frame_editing/frame_editing_unittest.cc @@ -14,7 +14,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/tools/frame_editing/frame_editing_lib.h" diff --git a/webrtc/tools/simple_command_line_parser_unittest.cc b/webrtc/tools/simple_command_line_parser_unittest.cc index 48640df172..739ce83ae1 100644 --- a/webrtc/tools/simple_command_line_parser_unittest.cc +++ b/webrtc/tools/simple_command_line_parser_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/tools/simple_command_line_parser.h" namespace webrtc { diff --git a/webrtc/video/call_stats_unittest.cc b/webrtc/video/call_stats_unittest.cc index f81a3a3eff..7f98c91876 100644 --- a/webrtc/video/call_stats_unittest.cc +++ b/webrtc/video/call_stats_unittest.cc @@ -10,8 +10,8 @@ #include -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/system_wrappers/include/metrics.h" diff --git a/webrtc/video/encoder_state_feedback_unittest.cc b/webrtc/video/encoder_state_feedback_unittest.cc index cf92813c48..fb9cf0c92e 100644 --- a/webrtc/video/encoder_state_feedback_unittest.cc +++ b/webrtc/video/encoder_state_feedback_unittest.cc @@ -10,8 +10,8 @@ #include "webrtc/video/encoder_state_feedback.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/utility/include/mock/mock_process_thread.h" #include "webrtc/video/vie_encoder.h" diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc index 021ec3a16f..0bd1ec2472 100644 --- a/webrtc/video/end_to_end_tests.cc +++ b/webrtc/video/end_to_end_tests.cc @@ -15,7 +15,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/checks.h" #include "webrtc/base/event.h" diff --git a/webrtc/video/full_stack.cc b/webrtc/video/full_stack.cc index 26aae3c1ff..c7d1bec1c0 100644 --- a/webrtc/video/full_stack.cc +++ b/webrtc/video/full_stack.cc @@ -9,7 +9,7 @@ */ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/video/video_quality_test.h" namespace webrtc { diff --git a/webrtc/video/overuse_frame_detector_unittest.cc b/webrtc/video/overuse_frame_detector_unittest.cc index d6700e248d..7f69ac00c9 100644 --- a/webrtc/video/overuse_frame_detector_unittest.cc +++ b/webrtc/video/overuse_frame_detector_unittest.cc @@ -12,8 +12,8 @@ #include "webrtc/video/overuse_frame_detector.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/event.h" #include "webrtc/system_wrappers/include/clock.h" diff --git a/webrtc/video/payload_router_unittest.cc b/webrtc/video/payload_router_unittest.cc index b5255d3827..ed8af9f90f 100644 --- a/webrtc/video/payload_router_unittest.cc +++ b/webrtc/video/payload_router_unittest.cc @@ -10,8 +10,8 @@ #include -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" #include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h" #include "webrtc/modules/video_coding/include/video_codec_interface.h" diff --git a/webrtc/video/replay.cc b/webrtc/video/replay.cc index eb734403d5..90bfc337ca 100644 --- a/webrtc/video/replay.cc +++ b/webrtc/video/replay.cc @@ -15,7 +15,7 @@ #include #include "gflags/gflags.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/checks.h" #include "webrtc/call.h" diff --git a/webrtc/video/report_block_stats_unittest.cc b/webrtc/video/report_block_stats_unittest.cc index 5cde9004b1..557f1f2a3b 100644 --- a/webrtc/video/report_block_stats_unittest.cc +++ b/webrtc/video/report_block_stats_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/video/report_block_stats.h" diff --git a/webrtc/video/screenshare_loopback.cc b/webrtc/video/screenshare_loopback.cc index 2d1e1d3468..b2e68beb49 100644 --- a/webrtc/video/screenshare_loopback.cc +++ b/webrtc/video/screenshare_loopback.cc @@ -11,7 +11,7 @@ #include #include "gflags/gflags.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/field_trial.h" #include "webrtc/test/run_test.h" diff --git a/webrtc/video/send_delay_stats_unittest.cc b/webrtc/video/send_delay_stats_unittest.cc index 24d056c03b..811d63b49c 100644 --- a/webrtc/video/send_delay_stats_unittest.cc +++ b/webrtc/video/send_delay_stats_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/video/send_delay_stats.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/system_wrappers/include/metrics.h" #include "webrtc/system_wrappers/include/metrics_default.h" diff --git a/webrtc/video/send_statistics_proxy_unittest.cc b/webrtc/video/send_statistics_proxy_unittest.cc index 593c93b8e1..467665105a 100644 --- a/webrtc/video/send_statistics_proxy_unittest.cc +++ b/webrtc/video/send_statistics_proxy_unittest.cc @@ -15,7 +15,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/system_wrappers/include/metrics.h" #include "webrtc/system_wrappers/include/metrics_default.h" diff --git a/webrtc/video/stats_counter_unittest.cc b/webrtc/video/stats_counter_unittest.cc index 740e99effb..b906532bb7 100644 --- a/webrtc/video/stats_counter_unittest.cc +++ b/webrtc/video/stats_counter_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/video/stats_counter.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/system_wrappers/include/clock.h" diff --git a/webrtc/video/stream_synchronization_unittest.cc b/webrtc/video/stream_synchronization_unittest.cc index 2834dfe1b2..f09bee4ae7 100644 --- a/webrtc/video/stream_synchronization_unittest.cc +++ b/webrtc/video/stream_synchronization_unittest.cc @@ -12,7 +12,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/video/stream_synchronization.h" namespace webrtc { diff --git a/webrtc/video/video_decoder_unittest.cc b/webrtc/video/video_decoder_unittest.cc index b95aa20ee2..07bce411bb 100644 --- a/webrtc/video/video_decoder_unittest.cc +++ b/webrtc/video/video_decoder_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/video_decoder.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/checks.h" #include "webrtc/modules/video_coding/include/video_error_codes.h" diff --git a/webrtc/video/video_encoder_unittest.cc b/webrtc/video/video_encoder_unittest.cc index eb2b45026b..e1cfd233c6 100644 --- a/webrtc/video/video_encoder_unittest.cc +++ b/webrtc/video/video_encoder_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/video_encoder.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/modules/video_coding/include/video_error_codes.h" diff --git a/webrtc/video/video_loopback.cc b/webrtc/video/video_loopback.cc index da73640b44..9b4f784698 100644 --- a/webrtc/video/video_loopback.cc +++ b/webrtc/video/video_loopback.cc @@ -11,7 +11,7 @@ #include #include "gflags/gflags.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/field_trial.h" #include "webrtc/test/run_test.h" diff --git a/webrtc/video/video_quality_test.cc b/webrtc/video/video_quality_test.cc index ea0e0d9f79..6186aaf085 100644 --- a/webrtc/video/video_quality_test.cc +++ b/webrtc/video/video_quality_test.cc @@ -17,7 +17,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/checks.h" #include "webrtc/base/event.h" #include "webrtc/base/format_macros.h" diff --git a/webrtc/video/video_send_stream_tests.cc b/webrtc/video/video_send_stream_tests.cc index a36be32d32..656aadce37 100644 --- a/webrtc/video/video_send_stream_tests.cc +++ b/webrtc/video/video_send_stream_tests.cc @@ -11,7 +11,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/bind.h" #include "webrtc/base/checks.h" diff --git a/webrtc/video/vie_encoder_unittest.cc b/webrtc/video/vie_encoder_unittest.cc index 1ab6e681e6..00e6cefa6a 100644 --- a/webrtc/video/vie_encoder_unittest.cc +++ b/webrtc/video/vie_encoder_unittest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/logging.h" #include "webrtc/test/encoder_settings.h" #include "webrtc/test/fake_encoder.h" diff --git a/webrtc/video/vie_remb_unittest.cc b/webrtc/video/vie_remb_unittest.cc index 2c33401b45..f3f4edddcf 100644 --- a/webrtc/video/vie_remb_unittest.cc +++ b/webrtc/video/vie_remb_unittest.cc @@ -11,8 +11,8 @@ #include #include -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" #include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h" #include "webrtc/modules/utility/include/mock/mock_process_thread.h" diff --git a/webrtc/voice_engine/channel_unittest.cc b/webrtc/voice_engine/channel_unittest.cc index a6b1ea617f..e040b77bac 100644 --- a/webrtc/voice_engine/channel_unittest.cc +++ b/webrtc/voice_engine/channel_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/voice_engine/channel.h" // Empty test just to get coverage metrics. diff --git a/webrtc/voice_engine/mock/mock_voe_observer.h b/webrtc/voice_engine/mock/mock_voe_observer.h index 1e8cbaa6bb..9abc2eb1dc 100644 --- a/webrtc/voice_engine/mock/mock_voe_observer.h +++ b/webrtc/voice_engine/mock/mock_voe_observer.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_VOICE_ENGINE_MOCK_VOE_OBSERVER_H_ #define WEBRTC_VOICE_ENGINE_MOCK_VOE_OBSERVER_H_ -#include "testing/gmock/include/gmock/gmock.h" +#include "webrtc/test/gmock.h" #include "webrtc/voice_engine/include/voe_base.h" namespace webrtc { diff --git a/webrtc/voice_engine/network_predictor_unittest.cc b/webrtc/voice_engine/network_predictor_unittest.cc index 1471f4629b..22f9d3a868 100644 --- a/webrtc/voice_engine/network_predictor_unittest.cc +++ b/webrtc/voice_engine/network_predictor_unittest.cc @@ -12,7 +12,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/voice_engine/network_predictor.h" #include "webrtc/system_wrappers/include/clock.h" diff --git a/webrtc/voice_engine/test/auto_test/automated_mode.cc b/webrtc/voice_engine/test/auto_test/automated_mode.cc index aa59e91441..67a73eecef 100644 --- a/webrtc/voice_engine/test/auto_test/automated_mode.cc +++ b/webrtc/voice_engine/test/auto_test/automated_mode.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/test/testsupport/fileutils.h" void InitializeGoogleTest(int* argc, char** argv) { 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 bbdf5015d4..c0f563add2 100644 --- a/webrtc/voice_engine/test/auto_test/fakes/conference_transport.h +++ b/webrtc/voice_engine/test/auto_test/fakes/conference_transport.h @@ -16,7 +16,7 @@ #include #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/basictypes.h" #include "webrtc/base/criticalsection.h" #include "webrtc/base/platform_thread.h" diff --git a/webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h b/webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h index 1b226ff74b..75f48b2c2a 100644 --- a/webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h +++ b/webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h @@ -27,8 +27,8 @@ #include "webrtc/voice_engine/include/voe_volume_control.h" #include "webrtc/voice_engine/test/auto_test/voe_test_common.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" // This convenient fixture sets up all voice engine interfaces automatically for // use by testing subclasses. It allocates each interface and releases it once 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 946eb4e525..770df033a4 100644 --- a/webrtc/voice_engine/test/auto_test/voe_conference_test.cc +++ b/webrtc/voice_engine/test/auto_test/voe_conference_test.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/format_macros.h" #include "webrtc/base/timeutils.h" #include "webrtc/system_wrappers/include/sleep.h" diff --git a/webrtc/voice_engine/test/auto_test/voe_output_test.cc b/webrtc/voice_engine/test/auto_test/voe_output_test.cc index 4044fbaf42..a732a2ec12 100644 --- a/webrtc/voice_engine/test/auto_test/voe_output_test.cc +++ b/webrtc/voice_engine/test/auto_test/voe_output_test.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/random.h" #include "webrtc/base/timeutils.h" #include "webrtc/system_wrappers/include/sleep.h" diff --git a/webrtc/voice_engine/test/channel_transport/channel_transport.cc b/webrtc/voice_engine/test/channel_transport/channel_transport.cc index 785f65b865..91c83d74a1 100644 --- a/webrtc/voice_engine/test/channel_transport/channel_transport.cc +++ b/webrtc/voice_engine/test/channel_transport/channel_transport.cc @@ -13,7 +13,7 @@ #include #if !defined(WEBRTC_ANDROID) && !defined(WEBRTC_IOS) -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #endif #include "webrtc/voice_engine/test/channel_transport/udp_transport.h" #include "webrtc/voice_engine/include/voe_network.h" diff --git a/webrtc/voice_engine/test/channel_transport/udp_socket_manager_unittest.cc b/webrtc/voice_engine/test/channel_transport/udp_socket_manager_unittest.cc index 812fb2347c..7fce793015 100644 --- a/webrtc/voice_engine/test/channel_transport/udp_socket_manager_unittest.cc +++ b/webrtc/voice_engine/test/channel_transport/udp_socket_manager_unittest.cc @@ -15,7 +15,7 @@ // It also uses the static UdpSocketManager object. // The most important property of these tests is that they do not leak memory. -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/system_wrappers/include/trace.h" #include "webrtc/voice_engine/test/channel_transport/udp_socket_manager_wrapper.h" #include "webrtc/voice_engine/test/channel_transport/udp_socket_wrapper.h" diff --git a/webrtc/voice_engine/test/channel_transport/udp_socket_wrapper_unittest.cc b/webrtc/voice_engine/test/channel_transport/udp_socket_wrapper_unittest.cc index 4bbd849a12..befd61108d 100644 --- a/webrtc/voice_engine/test/channel_transport/udp_socket_wrapper_unittest.cc +++ b/webrtc/voice_engine/test/channel_transport/udp_socket_wrapper_unittest.cc @@ -20,8 +20,8 @@ // This is done differently in the Winsock2 code, but that code // will also hang if the destructor is called directly. -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/voice_engine/test/channel_transport/udp_socket_manager_wrapper.h" #include "webrtc/voice_engine/test/channel_transport/udp_socket_wrapper.h" diff --git a/webrtc/voice_engine/test/channel_transport/udp_transport_unittest.cc b/webrtc/voice_engine/test/channel_transport/udp_transport_unittest.cc index f2f9d6ba6a..559b8ccdab 100644 --- a/webrtc/voice_engine/test/channel_transport/udp_transport_unittest.cc +++ b/webrtc/voice_engine/test/channel_transport/udp_transport_unittest.cc @@ -10,8 +10,8 @@ #include -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gmock.h" +#include "webrtc/test/gtest.h" #include "webrtc/voice_engine/test/channel_transport/udp_transport.h" // We include the implementation header file to get at the dependency-injecting // constructor. diff --git a/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc b/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc index 0208c701c7..fbd5235810 100644 --- a/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc +++ b/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc @@ -19,7 +19,7 @@ #include #include "gflags/gflags.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/format_macros.h" #include "webrtc/engine_configurations.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" diff --git a/webrtc/voice_engine/transmit_mixer_unittest.cc b/webrtc/voice_engine/transmit_mixer_unittest.cc index 27aa8b3f01..bd390ae1d5 100644 --- a/webrtc/voice_engine/transmit_mixer_unittest.cc +++ b/webrtc/voice_engine/transmit_mixer_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/voice_engine/transmit_mixer.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/voice_engine/include/voe_external_media.h" namespace webrtc { diff --git a/webrtc/voice_engine/utility_unittest.cc b/webrtc/voice_engine/utility_unittest.cc index 921c3e5085..d52968297b 100644 --- a/webrtc/voice_engine/utility_unittest.cc +++ b/webrtc/voice_engine/utility_unittest.cc @@ -10,7 +10,7 @@ #include -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/base/format_macros.h" #include "webrtc/common_audio/resampler/include/push_resampler.h" #include "webrtc/modules/include/module_common_types.h" diff --git a/webrtc/voice_engine/voe_audio_processing_unittest.cc b/webrtc/voice_engine/voe_audio_processing_unittest.cc index 0d725bcc9a..ab4f3cc4fd 100644 --- a/webrtc/voice_engine/voe_audio_processing_unittest.cc +++ b/webrtc/voice_engine/voe_audio_processing_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/voice_engine/include/voe_audio_processing.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/voice_engine/include/voe_base.h" namespace webrtc { diff --git a/webrtc/voice_engine/voe_base_unittest.cc b/webrtc/voice_engine/voe_base_unittest.cc index e53dee2eff..f87d324af2 100644 --- a/webrtc/voice_engine/voe_base_unittest.cc +++ b/webrtc/voice_engine/voe_base_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/voice_engine/include/voe_base.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/voice_engine/channel_manager.h" #include "webrtc/voice_engine/shared_data.h" diff --git a/webrtc/voice_engine/voe_codec_unittest.cc b/webrtc/voice_engine/voe_codec_unittest.cc index c056ba07e3..acef75a9a8 100644 --- a/webrtc/voice_engine/voe_codec_unittest.cc +++ b/webrtc/voice_engine/voe_codec_unittest.cc @@ -12,7 +12,7 @@ #include "webrtc/voice_engine/include/voe_codec.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_device/include/fake_audio_device.h" #include "webrtc/voice_engine/include/voe_base.h" #include "webrtc/voice_engine/include/voe_hardware.h" diff --git a/webrtc/voice_engine/voe_network_unittest.cc b/webrtc/voice_engine/voe_network_unittest.cc index e5d8cc8b16..ef6e4fb5f3 100644 --- a/webrtc/voice_engine/voe_network_unittest.cc +++ b/webrtc/voice_engine/voe_network_unittest.cc @@ -10,7 +10,7 @@ #include "webrtc/voice_engine/include/voe_network.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/voice_engine/include/voe_errors.h" #include "webrtc/voice_engine/voice_engine_fixture.h" diff --git a/webrtc/voice_engine/voice_engine_fixture.h b/webrtc/voice_engine/voice_engine_fixture.h index 2967678e2f..0dabf28304 100644 --- a/webrtc/voice_engine/voice_engine_fixture.h +++ b/webrtc/voice_engine/voice_engine_fixture.h @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "testing/gtest/include/gtest/gtest.h" +#include "webrtc/test/gtest.h" #include "webrtc/modules/audio_device/include/fake_audio_device.h" #include "webrtc/test/mock_transport.h" #include "webrtc/voice_engine/include/voe_base.h"