Enable the -Wundef warning for clang
NOPRESUBMIT=true
BUG=webrtc:6398
Review-Url: https://codereview.webrtc.org/2358993004
Cr-Original-Commit-Position: refs/heads/master@{#14425}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 77eab704707e03c74eda3126b92e4ef5e2b7eb4d
diff --git a/BUILD.gn b/BUILD.gn
index bd6288b..4eeba6a 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -179,6 +179,7 @@
"-Wimplicit-fallthrough",
"-Wthread-safety",
"-Winconsistent-missing-override",
+ "-Wundef",
]
}
}
diff --git a/DEPS b/DEPS
index ffb67d1..27b0eec 100644
--- a/DEPS
+++ b/DEPS
@@ -7,7 +7,6 @@
"+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/api/mediastream_unittest.cc b/api/mediastream_unittest.cc
index 1881cce..b5f783f 100644
--- a/api/mediastream_unittest.cc
+++ b/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/api/peerconnectioninterface_unittest.cc b/api/peerconnectioninterface_unittest.cc
index d9c8af0..c639f98 100644
--- a/api/peerconnectioninterface_unittest.cc
+++ b/api/peerconnectioninterface_unittest.cc
@@ -12,7 +12,7 @@
#include <string>
#include <utility>
-#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/api/proxy_unittest.cc b/api/proxy_unittest.cc
index 005d062..8c16513 100644
--- a/api/proxy_unittest.cc
+++ b/api/proxy_unittest.cc
@@ -13,7 +13,7 @@
#include <memory>
#include <string>
-#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/api/rtpsenderreceiver_unittest.cc b/api/rtpsenderreceiver_unittest.cc
index 8c91e14..ea0bd64 100644
--- a/api/rtpsenderreceiver_unittest.cc
+++ b/api/rtpsenderreceiver_unittest.cc
@@ -12,8 +12,8 @@
#include <string>
#include <utility>
-#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/api/statscollector_unittest.cc b/api/statscollector_unittest.cc
index b2fb93c..f5270fd 100644
--- a/api/statscollector_unittest.cc
+++ b/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/api/test/androidtestinitializer.cc b/api/test/androidtestinitializer.cc
index 6791810..2d18ae5 100644
--- a/api/test/androidtestinitializer.cc
+++ b/api/test/androidtestinitializer.cc
@@ -12,12 +12,16 @@
#include <pthread.h>
+#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/api/test/mock_datachannel.h b/api/test/mock_datachannel.h
index 5828e4c..a09964e 100644
--- a/api/test/mock_datachannel.h
+++ b/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/api/test/mock_peerconnection.h b/api/test/mock_peerconnection.h
index 21b24a9..50e6618 100644
--- a/api/test/mock_peerconnection.h
+++ b/api/test/mock_peerconnection.h
@@ -14,7 +14,7 @@
#include <vector>
#include "webrtc/api/peerconnection.h"
-#include "testing/gmock/include/gmock/gmock.h"
+#include "webrtc/test/gmock.h"
namespace webrtc {
diff --git a/api/test/mock_webrtcsession.h b/api/test/mock_webrtcsession.h
index 459e349..108bdca 100644
--- a/api/test/mock_webrtcsession.h
+++ b/api/test/mock_webrtcsession.h
@@ -15,7 +15,7 @@
#include <string>
#include "webrtc/api/webrtcsession.h"
-#include "testing/gmock/include/gmock/gmock.h"
+#include "webrtc/test/gmock.h"
namespace webrtc {
diff --git a/audio/audio_receive_stream_unittest.cc b/audio/audio_receive_stream_unittest.cc
index 9276c28..77b529e 100644
--- a/audio/audio_receive_stream_unittest.cc
+++ b/audio/audio_receive_stream_unittest.cc
@@ -11,7 +11,7 @@
#include <string>
#include <vector>
-#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/audio/audio_send_stream_unittest.cc b/audio/audio_send_stream_unittest.cc
index ebac828..c7eb24c 100644
--- a/audio/audio_send_stream_unittest.cc
+++ b/audio/audio_send_stream_unittest.cc
@@ -11,7 +11,7 @@
#include <string>
#include <vector>
-#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/audio/audio_state_unittest.cc b/audio/audio_state_unittest.cc
index b0e2bc4..882766f 100644
--- a/audio/audio_state_unittest.cc
+++ b/audio/audio_state_unittest.cc
@@ -10,7 +10,7 @@
#include <memory>
-#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/base/BUILD.gn b/base/BUILD.gn
index f5dd4df..7256414 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -117,6 +117,7 @@
"file.h",
"format_macros.h",
"function_view.h",
+ "ignore_wundef.h",
"location.cc",
"location.h",
"md5.cc",
diff --git a/base/base.gyp b/base/base.gyp
index c2f5d31..0e923a3 100644
--- a/base/base.gyp
+++ b/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/base/basictypes.h b/base/basictypes.h
index 6ca09d0..87dcdc6 100644
--- a/base/basictypes.h
+++ b/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/base/bitbuffer_unittest.cc b/base/bitbuffer_unittest.cc
index 7ba9c73..b06bf49 100644
--- a/base/bitbuffer_unittest.cc
+++ b/base/bitbuffer_unittest.cc
@@ -168,7 +168,7 @@
// 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/base/common.cc b/base/common.cc
index c6f1b75..07eb0b1 100644
--- a/base/common.cc
+++ b/base/common.cc
@@ -13,7 +13,7 @@
#include <stdio.h>
#include <string.h>
-#if WEBRTC_WIN
+#ifdef WEBRTC_WIN
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#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/base/criticalsection.h b/base/criticalsection.h
index 217627e..bf77e2b 100644
--- a/base/criticalsection.h
+++ b/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/base/event.cc b/base/event.cc
index 0e267dc..4b348f6 100644
--- a/base/event.cc
+++ b/base/event.cc
@@ -86,7 +86,7 @@
// 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 @@
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/base/event_tracer_unittest.cc b/base/event_tracer_unittest.cc
index c1b86f2..6ea1275 100644
--- a/base/event_tracer_unittest.cc
+++ b/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/base/gunit.h b/base/gunit.h
index c3e8534..d49872d 100644
--- a/base/gunit.h
+++ b/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/base/httpclient.h b/base/httpclient.h
index 0c19d2e..569ff04 100644
--- a/base/httpclient.h
+++ b/base/httpclient.h
@@ -51,7 +51,7 @@
// 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/base/httpcommon.cc b/base/httpcommon.cc
index c90bea5..7bc18c4 100644
--- a/base/httpcommon.cc
+++ b/base/httpcommon.cc
@@ -388,7 +388,7 @@
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/base/ignore_wundef.h b/base/ignore_wundef.h
new file mode 100644
index 0000000..b5bf7f7
--- /dev/null
+++ b/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/base/logging.cc b/base/logging.cc
index c951e15..3624a40 100644
--- a/base/logging.cc
+++ b/base/logging.cc
@@ -150,7 +150,7 @@
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/base/logging.h b/base/logging.h
index 631c638..13f0b78 100644
--- a/base/logging.h
+++ b/base/logging.h
@@ -335,7 +335,7 @@
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/base/mod_ops_unittest.cc b/base/mod_ops_unittest.cc
index df59c13..931579d 100644
--- a/base/mod_ops_unittest.cc
+++ b/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/base/pathutils.cc b/base/pathutils.cc
index a420eb5..90869b4 100644
--- a/base/pathutils.cc
+++ b/base/pathutils.cc
@@ -33,7 +33,7 @@
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/base/platform_thread_unittest.cc b/base/platform_thread_unittest.cc
index 847946a..86f091f 100644
--- a/base/platform_thread_unittest.cc
+++ b/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/base/proxydetect.cc b/base/proxydetect.cc
index 71910aa..111cf4b 100644
--- a/base/proxydetect.cc
+++ b/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/base/random_unittest.cc b/base/random_unittest.cc
index ae1a0a2..9022206 100644
--- a/base/random_unittest.cc
+++ b/base/random_unittest.cc
@@ -13,7 +13,7 @@
#include <limits>
#include <vector>
-#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/base/rate_limiter_unittest.cc b/base/rate_limiter_unittest.cc
index d441128..198e3b2 100644
--- a/base/rate_limiter_unittest.cc
+++ b/base/rate_limiter_unittest.cc
@@ -11,7 +11,7 @@
#include <algorithm>
#include <memory>
-#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/base/rate_statistics_unittest.cc b/base/rate_statistics_unittest.cc
index f6ce528..0aa5ac2 100644
--- a/base/rate_statistics_unittest.cc
+++ b/base/rate_statistics_unittest.cc
@@ -10,7 +10,7 @@
#include <algorithm>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/base/rate_statistics.h"
namespace {
diff --git a/base/sequenced_task_checker_unittest.cc b/base/sequenced_task_checker_unittest.cc
index 2450bd5..13b1afc 100644
--- a/base/sequenced_task_checker_unittest.cc
+++ b/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 @@
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 @@
}
#endif
-#if !NDEBUG || DCHECK_ALWAYS_ON
+#if !defined(NDEBUG) || DCHECK_ALWAYS_ON
TEST(SequencedTaskCheckerTest, MethodNotAllowedOnDifferentTaskQueueInDebug) {
RunMethodOnDifferentTaskQueue(false);
}
@@ -217,7 +217,7 @@
}
#endif
-#if !NDEBUG || DCHECK_ALWAYS_ON
+#if !defined(NDEBUG) || DCHECK_ALWAYS_ON
TEST(SequencedTaskCheckerTest, DetachFromTaskQueueInDebug) {
DetachThenCallFromDifferentTaskQueue(false);
}
diff --git a/base/swap_queue_unittest.cc b/base/swap_queue_unittest.cc
index 21eb212..ff00626 100644
--- a/base/swap_queue_unittest.cc
+++ b/base/swap_queue_unittest.cc
@@ -12,7 +12,7 @@
#include <vector>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/base/thread_checker_unittest.cc b/base/thread_checker_unittest.cc
index 0a855a1..2e6afe9 100644
--- a/base/thread_checker_unittest.cc
+++ b/base/thread_checker_unittest.cc
@@ -12,7 +12,7 @@
#include <memory>
-#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/call/bitrate_allocator_unittest.cc b/call/bitrate_allocator_unittest.cc
index 7473ed4..811e76d 100644
--- a/call/bitrate_allocator_unittest.cc
+++ b/call/bitrate_allocator_unittest.cc
@@ -12,8 +12,8 @@
#include <memory>
#include <vector>
-#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/call/bitrate_estimator_tests.cc b/call/bitrate_estimator_tests.cc
index 2896c67..46f29da 100644
--- a/call/bitrate_estimator_tests.cc
+++ b/call/bitrate_estimator_tests.cc
@@ -12,7 +12,7 @@
#include <memory>
#include <string>
-#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/call/call_perf_tests.cc b/call/call_perf_tests.cc
index b980a5e..6258a85 100644
--- a/call/call_perf_tests.cc
+++ b/call/call_perf_tests.cc
@@ -13,7 +13,7 @@
#include <memory>
#include <string>
-#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/call/call_unittest.cc b/call/call_unittest.cc
index 4c2562d..14687d5 100644
--- a/call/call_unittest.cc
+++ b/call/call_unittest.cc
@@ -11,7 +11,7 @@
#include <list>
#include <memory>
-#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/call/mock/mock_rtc_event_log.h b/call/mock/mock_rtc_event_log.h
index 8ca73a3..7558411 100644
--- a/call/mock/mock_rtc_event_log.h
+++ b/call/mock/mock_rtc_event_log.h
@@ -13,7 +13,7 @@
#include <string>
-#include "testing/gmock/include/gmock/gmock.h"
+#include "webrtc/test/gmock.h"
#include "webrtc/call/rtc_event_log.h"
diff --git a/call/packet_injection_tests.cc b/call/packet_injection_tests.cc
index 1d52b88..ccd4f4a 100644
--- a/call/packet_injection_tests.cc
+++ b/call/packet_injection_tests.cc
@@ -10,7 +10,7 @@
#include <memory>
-#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/call/rampup_tests.cc b/call/rampup_tests.cc
index 2d7dddc..bbfd87b 100644
--- a/call/rampup_tests.cc
+++ b/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/call/ringbuffer_unittest.cc b/call/ringbuffer_unittest.cc
index e2b5a41..166c4f6 100644
--- a/call/ringbuffer_unittest.cc
+++ b/call/ringbuffer_unittest.cc
@@ -11,7 +11,7 @@
#include <list>
-#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/call/rtc_event_log_helper_thread.h b/call/rtc_event_log_helper_thread.h
index 2d5a785..1408961 100644
--- a/call/rtc_event_log_helper_thread.h
+++ b/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/call/rtc_event_log_parser.h b/call/rtc_event_log_parser.h
index 74f066d..a50ec20 100644
--- a/call/rtc_event_log_parser.h
+++ b/call/rtc_event_log_parser.h
@@ -13,16 +13,19 @@
#include <string>
#include <vector>
+#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/call/rtc_event_log_unittest.cc b/call/rtc_event_log_unittest.cc
index 8e92c7e..2a96afe 100644
--- a/call/rtc_event_log_unittest.cc
+++ b/call/rtc_event_log_unittest.cc
@@ -14,7 +14,7 @@
#include <utility>
#include <vector>
-#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/call/rtc_event_log_unittest_helper.cc b/call/rtc_event_log_unittest_helper.cc
index d7092b8..ba19641 100644
--- a/call/rtc_event_log_unittest_helper.cc
+++ b/call/rtc_event_log_unittest_helper.cc
@@ -14,7 +14,7 @@
#include <string>
-#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/common_audio/audio_converter_unittest.cc b/common_audio/audio_converter_unittest.cc
index f86e37b..26bb973 100644
--- a/common_audio/audio_converter_unittest.cc
+++ b/common_audio/audio_converter_unittest.cc
@@ -13,7 +13,7 @@
#include <memory>
#include <vector>
-#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/common_audio/audio_ring_buffer_unittest.cc b/common_audio/audio_ring_buffer_unittest.cc
index c5c38de..02c48d1 100644
--- a/common_audio/audio_ring_buffer_unittest.cc
+++ b/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/common_audio/audio_util_unittest.cc b/common_audio/audio_util_unittest.cc
index 5583778..c21eaca 100644
--- a/common_audio/audio_util_unittest.cc
+++ b/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/common_audio/blocker_unittest.cc b/common_audio/blocker_unittest.cc
index eea3e25..105bb81 100644
--- a/common_audio/blocker_unittest.cc
+++ b/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/common_audio/channel_buffer_unittest.cc b/common_audio/channel_buffer_unittest.cc
index 98731fc..80c4b72 100644
--- a/common_audio/channel_buffer_unittest.cc
+++ b/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/common_audio/fir_filter_unittest.cc b/common_audio/fir_filter_unittest.cc
index 9dffcb6..fdbd3ef 100644
--- a/common_audio/fir_filter_unittest.cc
+++ b/common_audio/fir_filter_unittest.cc
@@ -14,7 +14,7 @@
#include <memory>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace {
diff --git a/common_audio/lapped_transform_unittest.cc b/common_audio/lapped_transform_unittest.cc
index a78488e..66d4a59 100644
--- a/common_audio/lapped_transform_unittest.cc
+++ b/common_audio/lapped_transform_unittest.cc
@@ -14,7 +14,7 @@
#include <cmath>
#include <cstring>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
using std::complex;
diff --git a/common_audio/real_fourier_unittest.cc b/common_audio/real_fourier_unittest.cc
index 367fec3..dab28bb 100644
--- a/common_audio/real_fourier_unittest.cc
+++ b/common_audio/real_fourier_unittest.cc
@@ -12,7 +12,7 @@
#include <stdlib.h>
-#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/common_audio/resampler/push_resampler_unittest.cc b/common_audio/resampler/push_resampler_unittest.cc
index 53cd495..98657d1 100644
--- a/common_audio/resampler/push_resampler_unittest.cc
+++ b/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/common_audio/resampler/push_sinc_resampler_unittest.cc b/common_audio/resampler/push_sinc_resampler_unittest.cc
index aca73b2..c9a3358 100644
--- a/common_audio/resampler/push_sinc_resampler_unittest.cc
+++ b/common_audio/resampler/push_sinc_resampler_unittest.cc
@@ -12,8 +12,8 @@
#include <cstring>
#include <memory>
-#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/common_audio/resampler/resampler_unittest.cc b/common_audio/resampler/resampler_unittest.cc
index c5953d0..4c10f93 100644
--- a/common_audio/resampler/resampler_unittest.cc
+++ b/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/common_audio/resampler/sinc_resampler_unittest.cc b/common_audio/resampler/sinc_resampler_unittest.cc
index d3b0dcd..d965881 100644
--- a/common_audio/resampler/sinc_resampler_unittest.cc
+++ b/common_audio/resampler/sinc_resampler_unittest.cc
@@ -18,8 +18,8 @@
#include <memory>
-#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/common_audio/ring_buffer_unittest.cc b/common_audio/ring_buffer_unittest.cc
index 92c470a..d62e92d 100644
--- a/common_audio/ring_buffer_unittest.cc
+++ b/common_audio/ring_buffer_unittest.cc
@@ -16,7 +16,7 @@
#include <algorithm>
#include <memory>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/common_audio/signal_processing/real_fft_unittest.cc b/common_audio/signal_processing/real_fft_unittest.cc
index fa98836..ba8619a 100644
--- a/common_audio/signal_processing/real_fft_unittest.cc
+++ b/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/common_audio/signal_processing/signal_processing_unittest.cc b/common_audio/signal_processing/signal_processing_unittest.cc
index 445c421..9429bcd 100644
--- a/common_audio/signal_processing/signal_processing_unittest.cc
+++ b/common_audio/signal_processing/signal_processing_unittest.cc
@@ -11,7 +11,7 @@
#include <algorithm>
#include <sstream>
-#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/common_audio/sparse_fir_filter_unittest.cc b/common_audio/sparse_fir_filter_unittest.cc
index 21b28ed..edfbf52 100644
--- a/common_audio/sparse_fir_filter_unittest.cc
+++ b/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/common_audio/vad/mock/mock_vad.h b/common_audio/vad/mock/mock_vad.h
index bc763bb..cce72c6 100644
--- a/common_audio/vad/mock/mock_vad.h
+++ b/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/common_audio/vad/vad_core_unittest.cc b/common_audio/vad/vad_core_unittest.cc
index ee69484..de61bc9 100644
--- a/common_audio/vad/vad_core_unittest.cc
+++ b/common_audio/vad/vad_core_unittest.cc
@@ -10,7 +10,7 @@
#include <stdlib.h>
-#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/common_audio/vad/vad_filterbank_unittest.cc b/common_audio/vad/vad_filterbank_unittest.cc
index 11b503a..58e70bf 100644
--- a/common_audio/vad/vad_filterbank_unittest.cc
+++ b/common_audio/vad/vad_filterbank_unittest.cc
@@ -10,7 +10,7 @@
#include <stdlib.h>
-#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/common_audio/vad/vad_gmm_unittest.cc b/common_audio/vad/vad_gmm_unittest.cc
index 31a8a15..eff81dd 100644
--- a/common_audio/vad/vad_gmm_unittest.cc
+++ b/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/common_audio/vad/vad_sp_unittest.cc b/common_audio/vad/vad_sp_unittest.cc
index 6d5e2a6..0c6827f 100644
--- a/common_audio/vad/vad_sp_unittest.cc
+++ b/common_audio/vad/vad_sp_unittest.cc
@@ -10,7 +10,7 @@
#include <stdlib.h>
-#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/common_audio/vad/vad_unittest.cc b/common_audio/vad/vad_unittest.cc
index a0e16b1..a3dcba9 100644
--- a/common_audio/vad/vad_unittest.cc
+++ b/common_audio/vad/vad_unittest.cc
@@ -12,7 +12,7 @@
#include <stdlib.h>
-#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/common_audio/vad/vad_unittest.h b/common_audio/vad/vad_unittest.h
index 3efe61b..ae11340 100644
--- a/common_audio/vad/vad_unittest.h
+++ b/common_audio/vad/vad_unittest.h
@@ -13,7 +13,7 @@
#include <stddef.h> // size_t
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/typedefs.h"
diff --git a/common_audio/wav_file_unittest.cc b/common_audio/wav_file_unittest.cc
index ba1db1c..7bad87a 100644
--- a/common_audio/wav_file_unittest.cc
+++ b/common_audio/wav_file_unittest.cc
@@ -14,7 +14,7 @@
#include <cmath>
#include <limits>
-#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/common_audio/wav_header_unittest.cc b/common_audio/wav_header_unittest.cc
index 8527939..cf5e010 100644
--- a/common_audio/wav_header_unittest.cc
+++ b/common_audio/wav_header_unittest.cc
@@ -10,7 +10,7 @@
#include <limits>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/common_audio/wav_header.h"
namespace webrtc {
diff --git a/common_audio/window_generator_unittest.cc b/common_audio/window_generator_unittest.cc
index 124b301..d0d2903 100644
--- a/common_audio/window_generator_unittest.cc
+++ b/common_audio/window_generator_unittest.cc
@@ -12,7 +12,7 @@
#include <cstring>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/common_types.h b/common_types.h
index b8c0df4..b1842ef 100644
--- a/common_types.h
+++ b/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/common_video/bitrate_adjuster_unittest.cc b/common_video/bitrate_adjuster_unittest.cc
index d0517e4..5e509b3 100644
--- a/common_video/bitrate_adjuster_unittest.cc
+++ b/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/common_video/h264/pps_parser_unittest.cc b/common_video/h264/pps_parser_unittest.cc
index 8be8b23..7474753 100644
--- a/common_video/h264/pps_parser_unittest.cc
+++ b/common_video/h264/pps_parser_unittest.cc
@@ -13,7 +13,7 @@
#include <limits>
#include <memory>
-#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/common_video/h264/sps_parser_unittest.cc b/common_video/h264/sps_parser_unittest.cc
index 514d41f..bf3cd09 100644
--- a/common_video/h264/sps_parser_unittest.cc
+++ b/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/common_video/h264/sps_vui_rewriter_unittest.cc b/common_video/h264/sps_vui_rewriter_unittest.cc
index c0298ad..12c2741 100644
--- a/common_video/h264/sps_vui_rewriter_unittest.cc
+++ b/common_video/h264/sps_vui_rewriter_unittest.cc
@@ -10,7 +10,7 @@
#include <vector>
-#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/common_video/i420_buffer_pool_unittest.cc b/common_video/i420_buffer_pool_unittest.cc
index 3307539..7dfe792 100644
--- a/common_video/i420_buffer_pool_unittest.cc
+++ b/common_video/i420_buffer_pool_unittest.cc
@@ -10,7 +10,7 @@
#include <string>
-#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/common_video/i420_video_frame_unittest.cc b/common_video/i420_video_frame_unittest.cc
index 0ce2daa..4d41c9d 100644
--- a/common_video/i420_video_frame_unittest.cc
+++ b/common_video/i420_video_frame_unittest.cc
@@ -11,7 +11,7 @@
#include <math.h>
#include <string.h>
-#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/common_video/libyuv/libyuv_unittest.cc b/common_video/libyuv/libyuv_unittest.cc
index c6ca212..7545168 100644
--- a/common_video/libyuv/libyuv_unittest.cc
+++ b/common_video/libyuv/libyuv_unittest.cc
@@ -13,7 +13,7 @@
#include <memory>
-#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/examples/objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.m b/examples/objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.m
index b8add7f..b4868a7 100644
--- a/examples/objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.m
+++ b/examples/objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.m
@@ -569,7 +569,7 @@
[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/media/base/test/mock_mediachannel.h b/media/base/test/mock_mediachannel.h
index 6330fe0..6f7e2e5 100644
--- a/media/base/test/mock_mediachannel.h
+++ b/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/media/engine/nullwebrtcvideoengine_unittest.cc b/media/engine/nullwebrtcvideoengine_unittest.cc
index 52cd0f2..8ccaa2f 100644
--- a/media/engine/nullwebrtcvideoengine_unittest.cc
+++ b/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/media/engine/payload_type_mapper_unittest.cc b/media/engine/payload_type_mapper_unittest.cc
index 7042086..d11644c 100644
--- a/media/engine/payload_type_mapper_unittest.cc
+++ b/media/engine/payload_type_mapper_unittest.cc
@@ -11,7 +11,7 @@
#include <set>
#include <string>
-#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/media/engine/simulcast_unittest.cc b/media/engine/simulcast_unittest.cc
index f01fdcb..da54767 100644
--- a/media/engine/simulcast_unittest.cc
+++ b/media/engine/simulcast_unittest.cc
@@ -10,7 +10,7 @@
#include <string>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/media/engine/simulcast.h"
namespace cricket {
diff --git a/media/engine/webrtcmediaengine_unittest.cc b/media/engine/webrtcmediaengine_unittest.cc
index a3e4120..1416324 100644
--- a/media/engine/webrtcmediaengine_unittest.cc
+++ b/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/modules/audio_coding/acm2/acm_receive_test_oldapi.cc b/modules/audio_coding/acm2/acm_receive_test_oldapi.cc
index aac5e16..105221b 100644
--- a/modules/audio_coding/acm2/acm_receive_test_oldapi.cc
+++ b/modules/audio_coding/acm2/acm_receive_test_oldapi.cc
@@ -15,7 +15,7 @@
#include <memory>
-#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/modules/audio_coding/acm2/acm_receiver_unittest_oldapi.cc b/modules/audio_coding/acm2/acm_receiver_unittest_oldapi.cc
index aa46607..9551cac 100644
--- a/modules/audio_coding/acm2/acm_receiver_unittest_oldapi.cc
+++ b/modules/audio_coding/acm2/acm_receiver_unittest_oldapi.cc
@@ -13,7 +13,7 @@
#include <algorithm> // std::min
#include <memory>
-#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/modules/audio_coding/acm2/acm_send_test_oldapi.cc b/modules/audio_coding/acm2/acm_send_test_oldapi.cc
index e16e55b..63ddf3a 100644
--- a/modules/audio_coding/acm2/acm_send_test_oldapi.cc
+++ b/modules/audio_coding/acm2/acm_send_test_oldapi.cc
@@ -14,7 +14,7 @@
#include <stdio.h>
#include <string.h>
-#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/modules/audio_coding/acm2/audio_coding_module_unittest_oldapi.cc b/modules/audio_coding/acm2/audio_coding_module_unittest_oldapi.cc
index 2a8b834..5ae2038 100644
--- a/modules/audio_coding/acm2/audio_coding_module_unittest_oldapi.cc
+++ b/modules/audio_coding/acm2/audio_coding_module_unittest_oldapi.cc
@@ -13,7 +13,7 @@
#include <memory>
#include <vector>
-#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/modules/audio_coding/acm2/call_statistics_unittest.cc b/modules/audio_coding/acm2/call_statistics_unittest.cc
index 284532f..7c56b71 100644
--- a/modules/audio_coding/acm2/call_statistics_unittest.cc
+++ b/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/modules/audio_coding/acm2/codec_manager_unittest.cc b/modules/audio_coding/acm2/codec_manager_unittest.cc
index e8fe144..0108dc0 100644
--- a/modules/audio_coding/acm2/codec_manager_unittest.cc
+++ b/modules/audio_coding/acm2/codec_manager_unittest.cc
@@ -10,7 +10,7 @@
#include <memory>
-#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/modules/audio_coding/acm2/rent_a_codec_unittest.cc b/modules/audio_coding/acm2/rent_a_codec_unittest.cc
index 028a271..1816ae4 100644
--- a/modules/audio_coding/acm2/rent_a_codec_unittest.cc
+++ b/modules/audio_coding/acm2/rent_a_codec_unittest.cc
@@ -10,7 +10,7 @@
#include <memory>
-#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/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc
index 178d39c..ac508cf 100644
--- a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc
+++ b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc
@@ -11,7 +11,7 @@
#include <utility>
#include <vector>
-#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/modules/audio_coding/audio_network_adaptor/bitrate_controller_unittest.cc b/modules/audio_coding/audio_network_adaptor/bitrate_controller_unittest.cc
index 7474abe..bec0ec5 100644
--- a/modules/audio_coding/audio_network_adaptor/bitrate_controller_unittest.cc
+++ b/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/modules/audio_coding/audio_network_adaptor/channel_controller_unittest.cc b/modules/audio_coding/audio_network_adaptor/channel_controller_unittest.cc
index 2377ebf..2b09563 100644
--- a/modules/audio_coding/audio_network_adaptor/channel_controller_unittest.cc
+++ b/modules/audio_coding/audio_network_adaptor/channel_controller_unittest.cc
@@ -11,7 +11,7 @@
#include <memory>
#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/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc b/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc
index a6c8436..b0fb773 100644
--- a/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc
+++ b/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc
@@ -10,7 +10,7 @@
#include <utility>
-#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/modules/audio_coding/audio_network_adaptor/debug_dump_writer.cc b/modules/audio_coding/audio_network_adaptor/debug_dump_writer.cc
index 9992e2d..a2f258b 100644
--- a/modules/audio_coding/audio_network_adaptor/debug_dump_writer.cc
+++ b/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/modules/audio_coding/audio_network_adaptor/dtx_controller_unittest.cc b/modules/audio_coding/audio_network_adaptor/dtx_controller_unittest.cc
index e8fda9e..8c335d8 100644
--- a/modules/audio_coding/audio_network_adaptor/dtx_controller_unittest.cc
+++ b/modules/audio_coding/audio_network_adaptor/dtx_controller_unittest.cc
@@ -10,7 +10,7 @@
#include <memory>
-#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/modules/audio_coding/audio_network_adaptor/fec_controller_unittest.cc b/modules/audio_coding/audio_network_adaptor/fec_controller_unittest.cc
index c66482f..9bbec26 100644
--- a/modules/audio_coding/audio_network_adaptor/fec_controller_unittest.cc
+++ b/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/modules/audio_coding/audio_network_adaptor/frame_length_controller_unittest.cc b/modules/audio_coding/audio_network_adaptor/frame_length_controller_unittest.cc
index 68f3b10..5d45646 100644
--- a/modules/audio_coding/audio_network_adaptor/frame_length_controller_unittest.cc
+++ b/modules/audio_coding/audio_network_adaptor/frame_length_controller_unittest.cc
@@ -11,7 +11,7 @@
#include <memory>
#include <utility>
-#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/modules/audio_coding/audio_network_adaptor/mock/mock_controller.h b/modules/audio_coding/audio_network_adaptor/mock/mock_controller.h
index 88db391..b7a59cd 100644
--- a/modules/audio_coding/audio_network_adaptor/mock/mock_controller.h
+++ b/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/modules/audio_coding/audio_network_adaptor/mock/mock_controller_manager.h b/modules/audio_coding/audio_network_adaptor/mock/mock_controller_manager.h
index a1cc625..5a5808f 100644
--- a/modules/audio_coding/audio_network_adaptor/mock/mock_controller_manager.h
+++ b/modules/audio_coding/audio_network_adaptor/mock/mock_controller_manager.h
@@ -15,7 +15,7 @@
#include <vector>
#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/modules/audio_coding/audio_network_adaptor/mock/mock_debug_dump_writer.h b/modules/audio_coding/audio_network_adaptor/mock/mock_debug_dump_writer.h
index f7e226e..8be3d2e 100644
--- a/modules/audio_coding/audio_network_adaptor/mock/mock_debug_dump_writer.h
+++ b/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/modules/audio_coding/audio_network_adaptor/mock/mock_smoothing_filter.h b/modules/audio_coding/audio_network_adaptor/mock/mock_smoothing_filter.h
index f004d1b..844f16c 100644
--- a/modules/audio_coding/audio_network_adaptor/mock/mock_smoothing_filter.h
+++ b/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/modules/audio_coding/audio_network_adaptor/smoothing_filter_unittest.cc b/modules/audio_coding/audio_network_adaptor/smoothing_filter_unittest.cc
index 388ae4f..8ef90f2 100644
--- a/modules/audio_coding/audio_network_adaptor/smoothing_filter_unittest.cc
+++ b/modules/audio_coding/audio_network_adaptor/smoothing_filter_unittest.cc
@@ -10,7 +10,7 @@
#include <memory>
-#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/modules/audio_coding/codecs/audio_decoder_factory_unittest.cc b/modules/audio_coding/codecs/audio_decoder_factory_unittest.cc
index 9b53369..bda5391 100644
--- a/modules/audio_coding/codecs/audio_decoder_factory_unittest.cc
+++ b/modules/audio_coding/codecs/audio_decoder_factory_unittest.cc
@@ -10,7 +10,7 @@
#include <memory>
-#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/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc b/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc
index eb6c6d3..8511e9d 100644
--- a/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc
+++ b/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc
@@ -11,7 +11,7 @@
#include <memory>
#include <vector>
-#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/modules/audio_coding/codecs/cng/cng_unittest.cc b/modules/audio_coding/codecs/cng/cng_unittest.cc
index 95132a9..6860348 100644
--- a/modules/audio_coding/codecs/cng/cng_unittest.cc
+++ b/modules/audio_coding/codecs/cng/cng_unittest.cc
@@ -10,7 +10,7 @@
#include <memory>
#include <string>
-#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/modules/audio_coding/codecs/ilbc/ilbc_unittest.cc b/modules/audio_coding/codecs/ilbc/ilbc_unittest.cc
index 2abdaca..a4eaaa2 100644
--- a/modules/audio_coding/codecs/ilbc/ilbc_unittest.cc
+++ b/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/modules/audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc b/modules/audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc
index 4b03181..20c41b8 100644
--- a/modules/audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc
+++ b/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/modules/audio_coding/codecs/isac/fix/source/filters_unittest.cc b/modules/audio_coding/codecs/isac/fix/source/filters_unittest.cc
index 3ed5778..251f9d3 100644
--- a/modules/audio_coding/codecs/isac/fix/source/filters_unittest.cc
+++ b/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/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc b/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc
index 0984346..b030172 100644
--- a/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model_unittest.cc
+++ b/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/modules/audio_coding/codecs/isac/fix/source/transform_unittest.cc b/modules/audio_coding/codecs/isac/fix/source/transform_unittest.cc
index c5cc87f..9197483 100644
--- a/modules/audio_coding/codecs/isac/fix/source/transform_unittest.cc
+++ b/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/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac_unittest.cc b/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac_unittest.cc
index 6208095..8d781e1 100644
--- a/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac_unittest.cc
+++ b/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac_unittest.cc
@@ -10,7 +10,7 @@
#include <limits>
-#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/modules/audio_coding/codecs/isac/main/source/isac_unittest.cc b/modules/audio_coding/codecs/isac/main/source/isac_unittest.cc
index 6991f90..b7f4888 100644
--- a/modules/audio_coding/codecs/isac/main/source/isac_unittest.cc
+++ b/modules/audio_coding/codecs/isac/main/source/isac_unittest.cc
@@ -9,7 +9,7 @@
*/
#include <string>
-#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/modules/audio_coding/codecs/isac/unittest.cc b/modules/audio_coding/codecs/isac/unittest.cc
index 890397e..d304f33 100644
--- a/modules/audio_coding/codecs/isac/unittest.cc
+++ b/modules/audio_coding/codecs/isac/unittest.cc
@@ -13,7 +13,7 @@
#include <sstream>
#include <vector>
-#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/modules/audio_coding/codecs/legacy_encoded_audio_frame_unittest.cc b/modules/audio_coding/codecs/legacy_encoded_audio_frame_unittest.cc
index 9a07563..30f9737 100644
--- a/modules/audio_coding/codecs/legacy_encoded_audio_frame_unittest.cc
+++ b/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/modules/audio_coding/codecs/mock/mock_audio_decoder_factory.h b/modules/audio_coding/codecs/mock/mock_audio_decoder_factory.h
index 59bbb78..676d683 100644
--- a/modules/audio_coding/codecs/mock/mock_audio_decoder_factory.h
+++ b/modules/audio_coding/codecs/mock/mock_audio_decoder_factory.h
@@ -13,7 +13,7 @@
#include <vector>
-#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/modules/audio_coding/codecs/mock/mock_audio_encoder.h b/modules/audio_coding/codecs/mock/mock_audio_encoder.h
index 2ffb30b..cf076fa 100644
--- a/modules/audio_coding/codecs/mock/mock_audio_encoder.h
+++ b/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/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc b/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc
index 0adaeee..20b2368 100644
--- a/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc
+++ b/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc
@@ -10,7 +10,7 @@
#include <memory>
-#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/modules/audio_coding/codecs/opus/opus_fec_test.cc b/modules/audio_coding/codecs/opus/opus_fec_test.cc
index 560c978..c6dcb2e 100644
--- a/modules/audio_coding/codecs/opus/opus_fec_test.cc
+++ b/modules/audio_coding/codecs/opus/opus_fec_test.cc
@@ -10,7 +10,7 @@
#include <memory>
-#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/modules/audio_coding/codecs/opus/opus_inst.h b/modules/audio_coding/codecs/opus/opus_inst.h
index aa79b46..b2be12a 100644
--- a/modules/audio_coding/codecs/opus/opus_inst.h
+++ b/modules/audio_coding/codecs/opus/opus_inst.h
@@ -13,7 +13,11 @@
#include <stddef.h>
+#include "webrtc/base/ignore_wundef.h"
+
+RTC_PUSH_IGNORING_WUNDEF()
#include "opus.h"
+RTC_POP_IGNORING_WUNDEF()
struct WebRtcOpusEncInst {
OpusEncoder* encoder;
diff --git a/modules/audio_coding/codecs/opus/opus_unittest.cc b/modules/audio_coding/codecs/opus/opus_unittest.cc
index 84b2797..63f4e0a 100644
--- a/modules/audio_coding/codecs/opus/opus_unittest.cc
+++ b/modules/audio_coding/codecs/opus/opus_unittest.cc
@@ -11,7 +11,7 @@
#include <memory>
#include <string>
-#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/modules/audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc b/modules/audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc
index 22b2ceb..1d162e1 100644
--- a/modules/audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc
+++ b/modules/audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc
@@ -11,7 +11,7 @@
#include <memory>
#include <vector>
-#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/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc b/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc
index 3dc6654..b3fb7cf 100644
--- a/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc
+++ b/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/modules/audio_coding/codecs/tools/audio_codec_speed_test.h b/modules/audio_coding/codecs/tools/audio_codec_speed_test.h
index 3560eac..32ff9c6 100644
--- a/modules/audio_coding/codecs/tools/audio_codec_speed_test.h
+++ b/modules/audio_coding/codecs/tools/audio_codec_speed_test.h
@@ -13,7 +13,7 @@
#include <memory>
#include <string>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/modules/audio_coding/neteq/audio_classifier.h b/modules/audio_coding/neteq/audio_classifier.h
index 653b275..c94bd02 100644
--- a/modules/audio_coding/neteq/audio_classifier.h
+++ b/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/modules/audio_coding/neteq/audio_classifier_unittest.cc b/modules/audio_coding/neteq/audio_classifier_unittest.cc
index bdc5a05..09c5699 100644
--- a/modules/audio_coding/neteq/audio_classifier_unittest.cc
+++ b/modules/audio_coding/neteq/audio_classifier_unittest.cc
@@ -17,7 +17,7 @@
#include <memory>
#include <string>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/modules/audio_coding/neteq/audio_decoder_unittest.cc b/modules/audio_coding/neteq/audio_decoder_unittest.cc
index cddc3eb..376f8d7 100644
--- a/modules/audio_coding/neteq/audio_decoder_unittest.cc
+++ b/modules/audio_coding/neteq/audio_decoder_unittest.cc
@@ -17,7 +17,7 @@
#include <string>
#include <vector>
-#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/modules/audio_coding/neteq/audio_multi_vector_unittest.cc b/modules/audio_coding/neteq/audio_multi_vector_unittest.cc
index 864c2b2..af8d5f1 100644
--- a/modules/audio_coding/neteq/audio_multi_vector_unittest.cc
+++ b/modules/audio_coding/neteq/audio_multi_vector_unittest.cc
@@ -15,7 +15,7 @@
#include <string>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/modules/audio_coding/neteq/audio_vector_unittest.cc b/modules/audio_coding/neteq/audio_vector_unittest.cc
index cee7e58..e9ef93f 100644
--- a/modules/audio_coding/neteq/audio_vector_unittest.cc
+++ b/modules/audio_coding/neteq/audio_vector_unittest.cc
@@ -15,7 +15,7 @@
#include <string>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/modules/audio_coding/neteq/background_noise_unittest.cc b/modules/audio_coding/neteq/background_noise_unittest.cc
index bd69d67..3305b2c 100644
--- a/modules/audio_coding/neteq/background_noise_unittest.cc
+++ b/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/modules/audio_coding/neteq/buffer_level_filter_unittest.cc b/modules/audio_coding/neteq/buffer_level_filter_unittest.cc
index 4151a9b..cfa6e3d 100644
--- a/modules/audio_coding/neteq/buffer_level_filter_unittest.cc
+++ b/modules/audio_coding/neteq/buffer_level_filter_unittest.cc
@@ -14,7 +14,7 @@
#include <math.h> // Access to pow function.
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/audio_coding/neteq/comfort_noise_unittest.cc b/modules/audio_coding/neteq/comfort_noise_unittest.cc
index cc636a1..19ffd40 100644
--- a/modules/audio_coding/neteq/comfort_noise_unittest.cc
+++ b/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/modules/audio_coding/neteq/decision_logic_unittest.cc b/modules/audio_coding/neteq/decision_logic_unittest.cc
index c42ac44..e8bbb5e 100644
--- a/modules/audio_coding/neteq/decision_logic_unittest.cc
+++ b/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/modules/audio_coding/neteq/decoder_database_unittest.cc b/modules/audio_coding/neteq/decoder_database_unittest.cc
index 6ddad14..b97a49d 100644
--- a/modules/audio_coding/neteq/decoder_database_unittest.cc
+++ b/modules/audio_coding/neteq/decoder_database_unittest.cc
@@ -15,8 +15,8 @@
#include <string>
-#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/modules/audio_coding/neteq/delay_manager_unittest.cc b/modules/audio_coding/neteq/delay_manager_unittest.cc
index 3290e9c..8ccc735 100644
--- a/modules/audio_coding/neteq/delay_manager_unittest.cc
+++ b/modules/audio_coding/neteq/delay_manager_unittest.cc
@@ -14,8 +14,8 @@
#include <math.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/neteq/mock/mock_delay_peak_detector.h"
namespace webrtc {
diff --git a/modules/audio_coding/neteq/delay_peak_detector_unittest.cc b/modules/audio_coding/neteq/delay_peak_detector_unittest.cc
index 71a86ff..e927593 100644
--- a/modules/audio_coding/neteq/delay_peak_detector_unittest.cc
+++ b/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/modules/audio_coding/neteq/dsp_helper_unittest.cc b/modules/audio_coding/neteq/dsp_helper_unittest.cc
index a052a58..a771521 100644
--- a/modules/audio_coding/neteq/dsp_helper_unittest.cc
+++ b/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/modules/audio_coding/neteq/dtmf_buffer_unittest.cc b/modules/audio_coding/neteq/dtmf_buffer_unittest.cc
index dad4e76..1252f81 100644
--- a/modules/audio_coding/neteq/dtmf_buffer_unittest.cc
+++ b/modules/audio_coding/neteq/dtmf_buffer_unittest.cc
@@ -18,7 +18,7 @@
#include <iostream>
-#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/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc b/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc
index a55e6c9..7aa207b 100644
--- a/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc
+++ b/modules/audio_coding/neteq/dtmf_tone_generator_unittest.cc
@@ -14,7 +14,7 @@
#include <math.h>
-#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/modules/audio_coding/neteq/expand_unittest.cc b/modules/audio_coding/neteq/expand_unittest.cc
index f19487a..a697441 100644
--- a/modules/audio_coding/neteq/expand_unittest.cc
+++ b/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/modules/audio_coding/neteq/merge_unittest.cc b/modules/audio_coding/neteq/merge_unittest.cc
index ddb0e16..b6c62c9 100644
--- a/modules/audio_coding/neteq/merge_unittest.cc
+++ b/modules/audio_coding/neteq/merge_unittest.cc
@@ -14,7 +14,7 @@
#include <vector>
-#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/modules/audio_coding/neteq/mock/mock_audio_decoder.h b/modules/audio_coding/neteq/mock/mock_audio_decoder.h
index 64be080..64eeed1 100644
--- a/modules/audio_coding/neteq/mock/mock_audio_decoder.h
+++ b/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/modules/audio_coding/neteq/mock/mock_buffer_level_filter.h b/modules/audio_coding/neteq/mock/mock_buffer_level_filter.h
index 82dee2a..da22845 100644
--- a/modules/audio_coding/neteq/mock/mock_buffer_level_filter.h
+++ b/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/modules/audio_coding/neteq/mock/mock_decoder_database.h b/modules/audio_coding/neteq/mock/mock_decoder_database.h
index d3ee0af..03ea245 100644
--- a/modules/audio_coding/neteq/mock/mock_decoder_database.h
+++ b/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/modules/audio_coding/neteq/mock/mock_delay_manager.h b/modules/audio_coding/neteq/mock/mock_delay_manager.h
index 1e20dca..9a0c0e6 100644
--- a/modules/audio_coding/neteq/mock/mock_delay_manager.h
+++ b/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/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h b/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h
index 5564fba..3a80cb4 100644
--- a/modules/audio_coding/neteq/mock/mock_delay_peak_detector.h
+++ b/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/modules/audio_coding/neteq/mock/mock_dtmf_buffer.h b/modules/audio_coding/neteq/mock/mock_dtmf_buffer.h
index c76ffaf..0aac22c 100644
--- a/modules/audio_coding/neteq/mock/mock_dtmf_buffer.h
+++ b/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/modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h b/modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h
index a1c370e..bb0a535 100644
--- a/modules/audio_coding/neteq/mock/mock_dtmf_tone_generator.h
+++ b/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/modules/audio_coding/neteq/mock/mock_expand.h b/modules/audio_coding/neteq/mock/mock_expand.h
index f5ca077..9465f6f 100644
--- a/modules/audio_coding/neteq/mock/mock_expand.h
+++ b/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/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h b/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h
index 23a3ec4..1d630e7 100644
--- a/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h
+++ b/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/modules/audio_coding/neteq/mock/mock_packet_buffer.h b/modules/audio_coding/neteq/mock/mock_packet_buffer.h
index ef6c97e..fd52c3b 100644
--- a/modules/audio_coding/neteq/mock/mock_packet_buffer.h
+++ b/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/modules/audio_coding/neteq/mock/mock_red_payload_splitter.h b/modules/audio_coding/neteq/mock/mock_red_payload_splitter.h
index e1f4e04..8c6e939 100644
--- a/modules/audio_coding/neteq/mock/mock_red_payload_splitter.h
+++ b/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/modules/audio_coding/neteq/nack_tracker_unittest.cc b/modules/audio_coding/neteq/nack_tracker_unittest.cc
index e5c0c3b..c33a99f 100644
--- a/modules/audio_coding/neteq/nack_tracker_unittest.cc
+++ b/modules/audio_coding/neteq/nack_tracker_unittest.cc
@@ -15,7 +15,7 @@
#include <algorithm>
#include <memory>
-#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/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc b/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc
index a039013..98962be 100644
--- a/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc
+++ b/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc
@@ -12,7 +12,7 @@
#include <memory>
-#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/modules/audio_coding/neteq/neteq_impl_unittest.cc b/modules/audio_coding/neteq/neteq_impl_unittest.cc
index 24a0780..dfb598b 100644
--- a/modules/audio_coding/neteq/neteq_impl_unittest.cc
+++ b/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/modules/audio_coding/neteq/neteq_network_stats_unittest.cc b/modules/audio_coding/neteq/neteq_network_stats_unittest.cc
index 70424fd..63b2b5b 100644
--- a/modules/audio_coding/neteq/neteq_network_stats_unittest.cc
+++ b/modules/audio_coding/neteq/neteq_network_stats_unittest.cc
@@ -10,7 +10,7 @@
#include <memory>
-#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/modules/audio_coding/neteq/neteq_stereo_unittest.cc b/modules/audio_coding/neteq/neteq_stereo_unittest.cc
index 14b6562..442bf7a 100644
--- a/modules/audio_coding/neteq/neteq_stereo_unittest.cc
+++ b/modules/audio_coding/neteq/neteq_stereo_unittest.cc
@@ -15,7 +15,7 @@
#include <string>
#include <list>
-#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/modules/audio_coding/neteq/neteq_unittest.cc b/modules/audio_coding/neteq/neteq_unittest.cc
index 4b6e5d7..a5b5468 100644
--- a/modules/audio_coding/neteq/neteq_unittest.cc
+++ b/modules/audio_coding/neteq/neteq_unittest.cc
@@ -21,7 +21,8 @@
#include <vector>
#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& 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/modules/audio_coding/neteq/normal_unittest.cc b/modules/audio_coding/neteq/normal_unittest.cc
index 5e1fc13..07ec4f7 100644
--- a/modules/audio_coding/neteq/normal_unittest.cc
+++ b/modules/audio_coding/neteq/normal_unittest.cc
@@ -15,7 +15,7 @@
#include <memory>
#include <vector>
-#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/modules/audio_coding/neteq/packet_buffer_unittest.cc b/modules/audio_coding/neteq/packet_buffer_unittest.cc
index b1ac5ec..2069dbb 100644
--- a/modules/audio_coding/neteq/packet_buffer_unittest.cc
+++ b/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/modules/audio_coding/neteq/post_decode_vad_unittest.cc b/modules/audio_coding/neteq/post_decode_vad_unittest.cc
index 65efa7a..231d7f1 100644
--- a/modules/audio_coding/neteq/post_decode_vad_unittest.cc
+++ b/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/modules/audio_coding/neteq/random_vector_unittest.cc b/modules/audio_coding/neteq/random_vector_unittest.cc
index ad8e32d..ca0a378 100644
--- a/modules/audio_coding/neteq/random_vector_unittest.cc
+++ b/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/modules/audio_coding/neteq/red_payload_splitter_unittest.cc b/modules/audio_coding/neteq/red_payload_splitter_unittest.cc
index 5396ff4..7528e2b 100644
--- a/modules/audio_coding/neteq/red_payload_splitter_unittest.cc
+++ b/modules/audio_coding/neteq/red_payload_splitter_unittest.cc
@@ -17,7 +17,7 @@
#include <memory>
#include <utility> // 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/modules/audio_coding/neteq/sync_buffer_unittest.cc b/modules/audio_coding/neteq/sync_buffer_unittest.cc
index 0f7b989..5a6260c 100644
--- a/modules/audio_coding/neteq/sync_buffer_unittest.cc
+++ b/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/modules/audio_coding/neteq/test/RTPjitter.cc b/modules/audio_coding/neteq/test/RTPjitter.cc
index 75983d2..391f051 100644
--- a/modules/audio_coding/neteq/test/RTPjitter.cc
+++ b/modules/audio_coding/neteq/test/RTPjitter.cc
@@ -25,7 +25,7 @@
#include <assert.h>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/typedefs.h"
/*********************/
diff --git a/modules/audio_coding/neteq/test/RTPtimeshift.cc b/modules/audio_coding/neteq/test/RTPtimeshift.cc
index f45a97a..e419c5d 100644
--- a/modules/audio_coding/neteq/test/RTPtimeshift.cc
+++ b/modules/audio_coding/neteq/test/RTPtimeshift.cc
@@ -12,7 +12,7 @@
#include <algorithm>
#include <vector>
-#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/modules/audio_coding/neteq/test/neteq_performance_unittest.cc b/modules/audio_coding/neteq/test/neteq_performance_unittest.cc
index 14857c7..f9775b5 100644
--- a/modules/audio_coding/neteq/test/neteq_performance_unittest.cc
+++ b/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/modules/audio_coding/neteq/tick_timer_unittest.cc b/modules/audio_coding/neteq/tick_timer_unittest.cc
index 55edcf5..6f338d1 100644
--- a/modules/audio_coding/neteq/tick_timer_unittest.cc
+++ b/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/modules/audio_coding/neteq/time_stretch_unittest.cc b/modules/audio_coding/neteq/time_stretch_unittest.cc
index 8a32d20..6f84089 100644
--- a/modules/audio_coding/neteq/time_stretch_unittest.cc
+++ b/modules/audio_coding/neteq/time_stretch_unittest.cc
@@ -16,7 +16,7 @@
#include <map>
#include <memory>
-#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/modules/audio_coding/neteq/timestamp_scaler_unittest.cc b/modules/audio_coding/neteq/timestamp_scaler_unittest.cc
index 96cf2e4..ed7a9a2 100644
--- a/modules/audio_coding/neteq/timestamp_scaler_unittest.cc
+++ b/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/modules/audio_coding/neteq/tools/input_audio_file_unittest.cc b/modules/audio_coding/neteq/tools/input_audio_file_unittest.cc
index 13d847b..ff795d8 100644
--- a/modules/audio_coding/neteq/tools/input_audio_file_unittest.cc
+++ b/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/modules/audio_coding/neteq/tools/neteq_external_decoder_test.cc b/modules/audio_coding/neteq/tools/neteq_external_decoder_test.cc
index 15cb5cf..2422f07 100644
--- a/modules/audio_coding/neteq/tools/neteq_external_decoder_test.cc
+++ b/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/modules/audio_coding/neteq/tools/neteq_quality_test.h b/modules/audio_coding/neteq/tools/neteq_quality_test.h
index aa895ce..d8bd2ce 100644
--- a/modules/audio_coding/neteq/tools/neteq_quality_test.h
+++ b/modules/audio_coding/neteq/tools/neteq_quality_test.h
@@ -14,7 +14,7 @@
#include <fstream>
#include <memory>
#include <gflags/gflags.h>
-#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/modules/audio_coding/neteq/tools/packet_unittest.cc b/modules/audio_coding/neteq/tools/packet_unittest.cc
index b32f54e..940276b 100644
--- a/modules/audio_coding/neteq/tools/packet_unittest.cc
+++ b/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/modules/audio_coding/test/APITest.cc b/modules/audio_coding/test/APITest.cc
index c308308..771ca87 100644
--- a/modules/audio_coding/test/APITest.cc
+++ b/modules/audio_coding/test/APITest.cc
@@ -19,7 +19,7 @@
#include <ostream>
#include <string>
-#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/modules/audio_coding/test/EncodeDecodeTest.cc b/modules/audio_coding/test/EncodeDecodeTest.cc
index 7245023..93591f5 100644
--- a/modules/audio_coding/test/EncodeDecodeTest.cc
+++ b/modules/audio_coding/test/EncodeDecodeTest.cc
@@ -15,7 +15,7 @@
#include <stdio.h>
#include <stdlib.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/acm2/acm_common_defs.h"
diff --git a/modules/audio_coding/test/PCMFile.cc b/modules/audio_coding/test/PCMFile.cc
index b4acf35..d16071b 100644
--- a/modules/audio_coding/test/PCMFile.cc
+++ b/modules/audio_coding/test/PCMFile.cc
@@ -14,7 +14,7 @@
#include <stdio.h>
#include <string.h>
-#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/modules/audio_coding/test/PacketLossTest.cc b/modules/audio_coding/test/PacketLossTest.cc
index f6764ac..68f2615 100644
--- a/modules/audio_coding/test/PacketLossTest.cc
+++ b/modules/audio_coding/test/PacketLossTest.cc
@@ -12,7 +12,7 @@
#include <memory>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/modules/audio_coding/test/RTPFile.cc b/modules/audio_coding/test/RTPFile.cc
index 2ffe3da..d59d38c 100644
--- a/modules/audio_coding/test/RTPFile.cc
+++ b/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/modules/audio_coding/test/TestAllCodecs.cc b/modules/audio_coding/test/TestAllCodecs.cc
index 80a0464..74caaf4 100644
--- a/modules/audio_coding/test/TestAllCodecs.cc
+++ b/modules/audio_coding/test/TestAllCodecs.cc
@@ -14,7 +14,7 @@
#include <limits>
#include <string>
-#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/modules/audio_coding/test/TestStereo.cc b/modules/audio_coding/test/TestStereo.cc
index 85a2ae2..f0eb477 100644
--- a/modules/audio_coding/test/TestStereo.cc
+++ b/modules/audio_coding/test/TestStereo.cc
@@ -14,7 +14,7 @@
#include <string>
-#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/modules/audio_coding/test/Tester.cc b/modules/audio_coding/test/Tester.cc
index a27f0bc..f09cae3 100644
--- a/modules/audio_coding/test/Tester.cc
+++ b/modules/audio_coding/test/Tester.cc
@@ -12,7 +12,7 @@
#include <string>
#include <vector>
-#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/modules/audio_coding/test/TwoWayCommunication.cc b/modules/audio_coding/test/TwoWayCommunication.cc
index a5cf79e..bc36a02 100644
--- a/modules/audio_coding/test/TwoWayCommunication.cc
+++ b/modules/audio_coding/test/TwoWayCommunication.cc
@@ -20,7 +20,7 @@
#include <Windows.h>
#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/modules/audio_coding/test/delay_test.cc b/modules/audio_coding/test/delay_test.cc
index 04428d5..5ab98d3 100644
--- a/modules/audio_coding/test/delay_test.cc
+++ b/modules/audio_coding/test/delay_test.cc
@@ -15,7 +15,7 @@
#include <memory>
#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/modules/audio_coding/test/iSACTest.cc b/modules/audio_coding/test/iSACTest.cc
index f06833c..9729cf8 100644
--- a/modules/audio_coding/test/iSACTest.cc
+++ b/modules/audio_coding/test/iSACTest.cc
@@ -14,9 +14,9 @@
#include <stdio.h>
#include <string.h>
-#if _WIN32
+#ifdef _WIN32
#include <windows.h>
-#elif WEBRTC_LINUX
+#elif defined(WEBRTC_LINUX)
#include <time.h>
#else
#include <sys/time.h>
diff --git a/modules/audio_coding/test/insert_packet_with_timing.cc b/modules/audio_coding/test/insert_packet_with_timing.cc
index 27a8833..98ce06a 100644
--- a/modules/audio_coding/test/insert_packet_with_timing.cc
+++ b/modules/audio_coding/test/insert_packet_with_timing.cc
@@ -13,7 +13,7 @@
#include <memory>
#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/modules/audio_coding/test/opus_test.cc b/modules/audio_coding/test/opus_test.cc
index 5d25028..ba2a9df 100644
--- a/modules/audio_coding/test/opus_test.cc
+++ b/modules/audio_coding/test/opus_test.cc
@@ -14,7 +14,7 @@
#include <string>
-#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/modules/audio_coding/test/target_delay_unittest.cc b/modules/audio_coding/test/target_delay_unittest.cc
index 5de5bf2..6b0f2af 100644
--- a/modules/audio_coding/test/target_delay_unittest.cc
+++ b/modules/audio_coding/test/target_delay_unittest.cc
@@ -10,7 +10,7 @@
#include <memory>
-#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/modules/audio_coding/test/utility.cc b/modules/audio_coding/test/utility.cc
index 58b5a68..3a0afa1 100644
--- a/modules/audio_coding/test/utility.cc
+++ b/modules/audio_coding/test/utility.cc
@@ -15,7 +15,7 @@
#include <stdlib.h>
#include <string.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/acm2/acm_common_defs.h"
diff --git a/modules/audio_coding/test/utility.h b/modules/audio_coding/test/utility.h
index b6c3a7a..fe85933 100644
--- a/modules/audio_coding/test/utility.h
+++ b/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/modules/audio_conference_mixer/source/memory_pool.h b/modules/audio_conference_mixer/source/memory_pool.h
index 3c7e1b7..c0a8131 100644
--- a/modules/audio_conference_mixer/source/memory_pool.h
+++ b/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/modules/audio_conference_mixer/test/audio_conference_mixer_unittest.cc b/modules/audio_conference_mixer/test/audio_conference_mixer_unittest.cc
index e553e45..2acbfbf 100644
--- a/modules/audio_conference_mixer/test/audio_conference_mixer_unittest.cc
+++ b/modules/audio_conference_mixer/test/audio_conference_mixer_unittest.cc
@@ -10,7 +10,7 @@
#include <memory>
-#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/modules/audio_device/android/audio_device_unittest.cc b/modules/audio_device/android/audio_device_unittest.cc
index e3a4920..cfbe96f 100644
--- a/modules/audio_device/android/audio_device_unittest.cc
+++ b/modules/audio_device/android/audio_device_unittest.cc
@@ -16,8 +16,8 @@
#include <string>
#include <vector>
-#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/modules/audio_device/android/audio_manager_unittest.cc b/modules/audio_device/android/audio_manager_unittest.cc
index a655c1b..bf81f7f 100644
--- a/modules/audio_device/android/audio_manager_unittest.cc
+++ b/modules/audio_device/android/audio_manager_unittest.cc
@@ -10,7 +10,7 @@
#include <SLES/OpenSLES_Android.h>
-#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/modules/audio_device/android/ensure_initialized.cc b/modules/audio_device/android/ensure_initialized.cc
index 27a98d2..9bc08ab 100644
--- a/modules/audio_device/android/ensure_initialized.cc
+++ b/modules/audio_device/android/ensure_initialized.cc
@@ -12,10 +12,14 @@
#include <pthread.h>
+#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/modules/audio_device/fine_audio_buffer_unittest.cc b/modules/audio_device/fine_audio_buffer_unittest.cc
index ef189d1..a0dfb97 100644
--- a/modules/audio_device/fine_audio_buffer_unittest.cc
+++ b/modules/audio_device/fine_audio_buffer_unittest.cc
@@ -13,8 +13,8 @@
#include <limits.h>
#include <memory>
-#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/modules/audio_device/include/mock_audio_device.h b/modules/audio_device/include/mock_audio_device.h
index 4cd2441..00c95a8 100644
--- a/modules/audio_device/include/mock_audio_device.h
+++ b/modules/audio_device/include/mock_audio_device.h
@@ -12,7 +12,7 @@
#define WEBRTC_MODULES_AUDIO_DEVICE_INCLUDE_MOCK_AUDIO_DEVICE_H_
#include <string>
-#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/modules/audio_device/ios/audio_device_ios.mm b/modules/audio_device/ios/audio_device_ios.mm
index dc6cdcb..f1040d8 100644
--- a/modules/audio_device/ios/audio_device_ios.mm
+++ b/modules/audio_device/ios/audio_device_ios.mm
@@ -84,7 +84,8 @@
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/modules/audio_device/ios/audio_device_unittest_ios.cc b/modules/audio_device/ios/audio_device_unittest_ios.cc
index 1641572..56dbdc5 100644
--- a/modules/audio_device/ios/audio_device_unittest_ios.cc
+++ b/modules/audio_device/ios/audio_device_unittest_ios.cc
@@ -16,8 +16,8 @@
#include <string>
#include <vector>
-#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/modules/audio_device/ios/objc/RTCAudioSessionTest.mm b/modules/audio_device/ios/objc/RTCAudioSessionTest.mm
index 7cbd2a9..93a1e90 100644
--- a/modules/audio_device/ios/objc/RTCAudioSessionTest.mm
+++ b/modules/audio_device/ios/objc/RTCAudioSessionTest.mm
@@ -10,7 +10,7 @@
#import <Foundation/Foundation.h>
-#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/modules/audio_device/mock_audio_device_buffer.h b/modules/audio_device/mock_audio_device_buffer.h
index 07c9e29..8d09655 100644
--- a/modules/audio_device/mock_audio_device_buffer.h
+++ b/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/modules/audio_device/test/audio_device_test_api.cc b/modules/audio_device/test/audio_device_test_api.cc
index 1b3c428..d124e9c 100644
--- a/modules/audio_device/test/audio_device_test_api.cc
+++ b/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/modules/audio_mixer/test/audio_mixer_unittest.cc b/modules/audio_mixer/test/audio_mixer_unittest.cc
index 5258fdc..ed10685 100644
--- a/modules/audio_mixer/test/audio_mixer_unittest.cc
+++ b/modules/audio_mixer/test/audio_mixer_unittest.cc
@@ -13,7 +13,7 @@
#include <memory>
#include <utility>
-#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/modules/audio_processing/aec/echo_cancellation_unittest.cc b/modules/audio_processing/aec/echo_cancellation_unittest.cc
index 074816c..58fff81 100644
--- a/modules/audio_processing/aec/echo_cancellation_unittest.cc
+++ b/modules/audio_processing/aec/echo_cancellation_unittest.cc
@@ -16,7 +16,7 @@
#include <time.h>
#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/modules/audio_processing/aec/system_delay_unittest.cc b/modules/audio_processing/aec/system_delay_unittest.cc
index 51a4df2..d29642e 100644
--- a/modules/audio_processing/aec/system_delay_unittest.cc
+++ b/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/modules/audio_processing/agc/agc_manager_direct_unittest.cc b/modules/audio_processing/agc/agc_manager_direct_unittest.cc
index ce4db59..397f38c 100644
--- a/modules/audio_processing/agc/agc_manager_direct_unittest.cc
+++ b/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/modules/audio_processing/agc/loudness_histogram_unittest.cc b/modules/audio_processing/agc/loudness_histogram_unittest.cc
index 62db545..5c0b4ca 100644
--- a/modules/audio_processing/agc/loudness_histogram_unittest.cc
+++ b/modules/audio_processing/agc/loudness_histogram_unittest.cc
@@ -17,7 +17,7 @@
#include <cmath>
#include <memory>
-#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/modules/audio_processing/agc/mock_agc.h b/modules/audio_processing/agc/mock_agc.h
index 9e8f64e..4a837e5 100644
--- a/modules/audio_processing/agc/mock_agc.h
+++ b/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/modules/audio_processing/audio_buffer_unittest.cc b/modules/audio_processing/audio_buffer_unittest.cc
index c6a5e1d..38855d6 100644
--- a/modules/audio_processing/audio_buffer_unittest.cc
+++ b/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/modules/audio_processing/audio_processing_impl.h b/modules/audio_processing/audio_processing_impl.h
index 91754fd..c8162c1 100644
--- a/modules/audio_processing/audio_processing_impl.h
+++ b/modules/audio_processing/audio_processing_impl.h
@@ -17,6 +17,7 @@
#include <vector>
#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/modules/audio_processing/audio_processing_impl_locking_unittest.cc b/modules/audio_processing/audio_processing_impl_locking_unittest.cc
index 547e149..c55537d 100644
--- a/modules/audio_processing/audio_processing_impl_locking_unittest.cc
+++ b/modules/audio_processing/audio_processing_impl_locking_unittest.cc
@@ -14,7 +14,7 @@
#include <memory>
#include <vector>
-#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/modules/audio_processing/audio_processing_impl_unittest.cc b/modules/audio_processing/audio_processing_impl_unittest.cc
index a0c208a..9f5b515 100644
--- a/modules/audio_processing/audio_processing_impl_unittest.cc
+++ b/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/modules/audio_processing/audio_processing_performance_unittest.cc b/modules/audio_processing/audio_processing_performance_unittest.cc
index a29c96d..0048180 100644
--- a/modules/audio_processing/audio_processing_performance_unittest.cc
+++ b/modules/audio_processing/audio_processing_performance_unittest.cc
@@ -15,7 +15,7 @@
#include <memory>
#include <vector>
-#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/modules/audio_processing/audio_processing_unittest.cc b/modules/audio_processing/audio_processing_unittest.cc
index 646e8b7..b0c6526 100644
--- a/modules/audio_processing/audio_processing_unittest.cc
+++ b/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/modules/audio_processing/beamformer/array_util_unittest.cc b/modules/audio_processing/beamformer/array_util_unittest.cc
index e3a7bbd..0ec9e7b 100644
--- a/modules/audio_processing/beamformer/array_util_unittest.cc
+++ b/modules/audio_processing/beamformer/array_util_unittest.cc
@@ -16,7 +16,7 @@
#include <math.h>
#include <vector>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/audio_processing/beamformer/complex_matrix_unittest.cc b/modules/audio_processing/beamformer/complex_matrix_unittest.cc
index 63c8c4f..9ad790f 100644
--- a/modules/audio_processing/beamformer/complex_matrix_unittest.cc
+++ b/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/modules/audio_processing/beamformer/covariance_matrix_generator.cc b/modules/audio_processing/beamformer/covariance_matrix_generator.cc
index 78f4df5..5ca79c6 100644
--- a/modules/audio_processing/beamformer/covariance_matrix_generator.cc
+++ b/modules/audio_processing/beamformer/covariance_matrix_generator.cc
@@ -18,7 +18,7 @@
namespace {
float BesselJ0(float x) {
-#if WEBRTC_WIN
+#ifdef WEBRTC_WIN
return _j0(x);
#else
return j0(x);
diff --git a/modules/audio_processing/beamformer/covariance_matrix_generator_unittest.cc b/modules/audio_processing/beamformer/covariance_matrix_generator_unittest.cc
index 23d672f..b754e20 100644
--- a/modules/audio_processing/beamformer/covariance_matrix_generator_unittest.cc
+++ b/modules/audio_processing/beamformer/covariance_matrix_generator_unittest.cc
@@ -14,7 +14,7 @@
#include <cmath>
-#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/modules/audio_processing/beamformer/matrix_test_helpers.h b/modules/audio_processing/beamformer/matrix_test_helpers.h
index 9891a82..2ec412f 100644
--- a/modules/audio_processing/beamformer/matrix_test_helpers.h
+++ b/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/modules/audio_processing/beamformer/matrix_unittest.cc b/modules/audio_processing/beamformer/matrix_unittest.cc
index 04aed70..66adb0e 100644
--- a/modules/audio_processing/beamformer/matrix_unittest.cc
+++ b/modules/audio_processing/beamformer/matrix_unittest.cc
@@ -10,7 +10,7 @@
#include <complex>
-#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/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h b/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h
index 3bb1485..b0be4ac 100644
--- a/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h
+++ b/modules/audio_processing/beamformer/mock_nonlinear_beamformer.h
@@ -13,7 +13,7 @@
#include <vector>
-#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/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc b/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc
index 1ad3ed6..ee211f2 100644
--- a/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc
+++ b/modules/audio_processing/beamformer/nonlinear_beamformer_unittest.cc
@@ -15,7 +15,7 @@
#include <math.h>
-#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/modules/audio_processing/config_unittest.cc b/modules/audio_processing/config_unittest.cc
index 2dd9f0d..33f4ed1 100644
--- a/modules/audio_processing/config_unittest.cc
+++ b/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/modules/audio_processing/echo_cancellation_bit_exact_unittest.cc b/modules/audio_processing/echo_cancellation_bit_exact_unittest.cc
index a79a03d..cc6af2e 100644
--- a/modules/audio_processing/echo_cancellation_bit_exact_unittest.cc
+++ b/modules/audio_processing/echo_cancellation_bit_exact_unittest.cc
@@ -9,7 +9,7 @@
*/
#include <vector>
-#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/modules/audio_processing/echo_cancellation_impl_unittest.cc b/modules/audio_processing/echo_cancellation_impl_unittest.cc
index e9a936f..ceb27e5 100644
--- a/modules/audio_processing/echo_cancellation_impl_unittest.cc
+++ b/modules/audio_processing/echo_cancellation_impl_unittest.cc
@@ -10,7 +10,7 @@
#include <memory>
-#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/modules/audio_processing/echo_control_mobile_unittest.cc b/modules/audio_processing/echo_control_mobile_unittest.cc
index d163781..4293814 100644
--- a/modules/audio_processing/echo_control_mobile_unittest.cc
+++ b/modules/audio_processing/echo_control_mobile_unittest.cc
@@ -9,7 +9,7 @@
*/
#include <vector>
-#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/modules/audio_processing/gain_control_unittest.cc b/modules/audio_processing/gain_control_unittest.cc
index c3d1d6c..413a7b6 100644
--- a/modules/audio_processing/gain_control_unittest.cc
+++ b/modules/audio_processing/gain_control_unittest.cc
@@ -9,7 +9,7 @@
*/
#include <vector>
-#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/modules/audio_processing/high_pass_filter_unittest.cc b/modules/audio_processing/high_pass_filter_unittest.cc
index f0414c0..db746f6 100644
--- a/modules/audio_processing/high_pass_filter_unittest.cc
+++ b/modules/audio_processing/high_pass_filter_unittest.cc
@@ -9,7 +9,7 @@
*/
#include <vector>
-#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/modules/audio_processing/intelligibility/intelligibility_enhancer_unittest.cc b/modules/audio_processing/intelligibility/intelligibility_enhancer_unittest.cc
index 0c56870..bccfd09 100644
--- a/modules/audio_processing/intelligibility/intelligibility_enhancer_unittest.cc
+++ b/modules/audio_processing/intelligibility/intelligibility_enhancer_unittest.cc
@@ -15,7 +15,7 @@
#include <memory>
#include <vector>
-#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/modules/audio_processing/intelligibility/intelligibility_utils_unittest.cc b/modules/audio_processing/intelligibility/intelligibility_utils_unittest.cc
index 08e8368..a9d3d31 100644
--- a/modules/audio_processing/intelligibility/intelligibility_utils_unittest.cc
+++ b/modules/audio_processing/intelligibility/intelligibility_utils_unittest.cc
@@ -12,7 +12,7 @@
#include <complex>
#include <vector>
-#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/modules/audio_processing/intelligibility/test/intelligibility_proc.cc b/modules/audio_processing/intelligibility/test/intelligibility_proc.cc
index c928124..bf3dba9 100644
--- a/modules/audio_processing/intelligibility/test/intelligibility_proc.cc
+++ b/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/modules/audio_processing/level_controller/level_controller_complexity_unittest.cc b/modules/audio_processing/level_controller/level_controller_complexity_unittest.cc
index b8033aa..bfd719b 100644
--- a/modules/audio_processing/level_controller/level_controller_complexity_unittest.cc
+++ b/modules/audio_processing/level_controller/level_controller_complexity_unittest.cc
@@ -11,7 +11,7 @@
#include <numeric>
#include <vector>
-#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/modules/audio_processing/level_controller/level_controller_unittest.cc b/modules/audio_processing/level_controller/level_controller_unittest.cc
index f5cea0d..dc07e49 100644
--- a/modules/audio_processing/level_controller/level_controller_unittest.cc
+++ b/modules/audio_processing/level_controller/level_controller_unittest.cc
@@ -10,7 +10,7 @@
#include <vector>
-#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/modules/audio_processing/level_estimator_unittest.cc b/modules/audio_processing/level_estimator_unittest.cc
index cb3bdf5..ce7064d 100644
--- a/modules/audio_processing/level_estimator_unittest.cc
+++ b/modules/audio_processing/level_estimator_unittest.cc
@@ -9,7 +9,7 @@
*/
#include <vector>
-#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/modules/audio_processing/noise_suppression_unittest.cc b/modules/audio_processing/noise_suppression_unittest.cc
index 320e1c5..4763614 100644
--- a/modules/audio_processing/noise_suppression_unittest.cc
+++ b/modules/audio_processing/noise_suppression_unittest.cc
@@ -9,7 +9,7 @@
*/
#include <vector>
-#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/modules/audio_processing/splitting_filter_unittest.cc b/modules/audio_processing/splitting_filter_unittest.cc
index e7af651..96a6408 100644
--- a/modules/audio_processing/splitting_filter_unittest.cc
+++ b/modules/audio_processing/splitting_filter_unittest.cc
@@ -13,7 +13,7 @@
#include <cmath>
-#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/modules/audio_processing/test/aec_dump_based_simulator.h b/modules/audio_processing/test/aec_dump_based_simulator.h
index cefc21b..c3d273c 100644
--- a/modules/audio_processing/test/aec_dump_based_simulator.h
+++ b/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/modules/audio_processing/test/bitexactness_tools.h b/modules/audio_processing/test/bitexactness_tools.h
index d4c09d4..4ddc7e3 100644
--- a/modules/audio_processing/test/bitexactness_tools.h
+++ b/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/modules/audio_processing/test/debug_dump_replayer.h b/modules/audio_processing/test/debug_dump_replayer.h
index 0902254..3bf886c 100644
--- a/modules/audio_processing/test/debug_dump_replayer.h
+++ b/modules/audio_processing/test/debug_dump_replayer.h
@@ -14,10 +14,14 @@
#include <memory>
#include <string>
+#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/modules/audio_processing/test/debug_dump_test.cc b/modules/audio_processing/test/debug_dump_test.cc
index 9987342..b8d4b43 100644
--- a/modules/audio_processing/test/debug_dump_test.cc
+++ b/modules/audio_processing/test/debug_dump_test.cc
@@ -14,7 +14,7 @@
#include <string>
#include <vector>
-#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/modules/audio_processing/test/process_test.cc b/modules/audio_processing/test/process_test.cc
index f1ac717..55df1d7 100644
--- a/modules/audio_processing/test/process_test.cc
+++ b/modules/audio_processing/test/process_test.cc
@@ -19,6 +19,7 @@
#include <memory>
#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/modules/audio_processing/test/protobuf_utils.h b/modules/audio_processing/test/protobuf_utils.h
index 3ab90b7..e132c94 100644
--- a/modules/audio_processing/test/protobuf_utils.h
+++ b/modules/audio_processing/test/protobuf_utils.h
@@ -13,7 +13,11 @@
#include <memory>
+#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/modules/audio_processing/test/unpack.cc b/modules/audio_processing/test/unpack.cc
index d3f1633..61e1ebe 100644
--- a/modules/audio_processing/test/unpack.cc
+++ b/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/modules/audio_processing/transient/dyadic_decimator_unittest.cc b/modules/audio_processing/transient/dyadic_decimator_unittest.cc
index f5c9f49..7f5bb03 100644
--- a/modules/audio_processing/transient/dyadic_decimator_unittest.cc
+++ b/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/modules/audio_processing/transient/file_utils_unittest.cc b/modules/audio_processing/transient/file_utils_unittest.cc
index 6a848c6..c975934 100644
--- a/modules/audio_processing/transient/file_utils_unittest.cc
+++ b/modules/audio_processing/transient/file_utils_unittest.cc
@@ -15,7 +15,7 @@
#include <memory>
#include <vector>
-#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/modules/audio_processing/transient/moving_moments_unittest.cc b/modules/audio_processing/transient/moving_moments_unittest.cc
index f1aa773..eb645ee 100644
--- a/modules/audio_processing/transient/moving_moments_unittest.cc
+++ b/modules/audio_processing/transient/moving_moments_unittest.cc
@@ -12,7 +12,7 @@
#include <memory>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/audio_processing/transient/transient_detector_unittest.cc b/modules/audio_processing/transient/transient_detector_unittest.cc
index fedddb7..dcf1e34 100644
--- a/modules/audio_processing/transient/transient_detector_unittest.cc
+++ b/modules/audio_processing/transient/transient_detector_unittest.cc
@@ -14,7 +14,7 @@
#include <sstream>
#include <string>
-#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/modules/audio_processing/transient/transient_suppression_test.cc b/modules/audio_processing/transient/transient_suppression_test.cc
index 90ebb22..447b3d4 100644
--- a/modules/audio_processing/transient/transient_suppression_test.cc
+++ b/modules/audio_processing/transient/transient_suppression_test.cc
@@ -17,7 +17,7 @@
#include <string>
#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/modules/audio_processing/transient/transient_suppressor_unittest.cc b/modules/audio_processing/transient/transient_suppressor_unittest.cc
index 0c1010e..1e67124 100644
--- a/modules/audio_processing/transient/transient_suppressor_unittest.cc
+++ b/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/modules/audio_processing/transient/wpd_node_unittest.cc b/modules/audio_processing/transient/wpd_node_unittest.cc
index 7ab6da8..3a9cb75 100644
--- a/modules/audio_processing/transient/wpd_node_unittest.cc
+++ b/modules/audio_processing/transient/wpd_node_unittest.cc
@@ -12,7 +12,7 @@
#include <string.h>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/audio_processing/transient/wpd_tree_unittest.cc b/modules/audio_processing/transient/wpd_tree_unittest.cc
index 3b08314..61a67e5 100644
--- a/modules/audio_processing/transient/wpd_tree_unittest.cc
+++ b/modules/audio_processing/transient/wpd_tree_unittest.cc
@@ -14,7 +14,7 @@
#include <sstream>
#include <string>
-#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/modules/audio_processing/utility/block_mean_calculator_unittest.cc b/modules/audio_processing/utility/block_mean_calculator_unittest.cc
index 3f74ac9..91146a6 100644
--- a/modules/audio_processing/utility/block_mean_calculator_unittest.cc
+++ b/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/modules/audio_processing/utility/delay_estimator_unittest.cc b/modules/audio_processing/utility/delay_estimator_unittest.cc
index 3e46763..a7d363a 100644
--- a/modules/audio_processing/utility/delay_estimator_unittest.cc
+++ b/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/modules/audio_processing/vad/gmm_unittest.cc b/modules/audio_processing/vad/gmm_unittest.cc
index f8e1bde..5444cbc 100644
--- a/modules/audio_processing/vad/gmm_unittest.cc
+++ b/modules/audio_processing/vad/gmm_unittest.cc
@@ -12,7 +12,7 @@
#include <math.h>
-#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/modules/audio_processing/vad/pitch_based_vad_unittest.cc b/modules/audio_processing/vad/pitch_based_vad_unittest.cc
index 04ddcab..5d82095 100644
--- a/modules/audio_processing/vad/pitch_based_vad_unittest.cc
+++ b/modules/audio_processing/vad/pitch_based_vad_unittest.cc
@@ -15,7 +15,7 @@
#include <string>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/modules/audio_processing/vad/pitch_internal_unittest.cc b/modules/audio_processing/vad/pitch_internal_unittest.cc
index 8b5959d..70124f8 100644
--- a/modules/audio_processing/vad/pitch_internal_unittest.cc
+++ b/modules/audio_processing/vad/pitch_internal_unittest.cc
@@ -12,7 +12,7 @@
#include <math.h>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
TEST(PitchInternalTest, test) {
const int kSamplingRateHz = 8000;
diff --git a/modules/audio_processing/vad/pole_zero_filter_unittest.cc b/modules/audio_processing/vad/pole_zero_filter_unittest.cc
index b3a0eb0..4bb8308 100644
--- a/modules/audio_processing/vad/pole_zero_filter_unittest.cc
+++ b/modules/audio_processing/vad/pole_zero_filter_unittest.cc
@@ -15,7 +15,7 @@
#include <memory>
-#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/modules/audio_processing/vad/standalone_vad_unittest.cc b/modules/audio_processing/vad/standalone_vad_unittest.cc
index 482a20a..c920415 100644
--- a/modules/audio_processing/vad/standalone_vad_unittest.cc
+++ b/modules/audio_processing/vad/standalone_vad_unittest.cc
@@ -14,7 +14,7 @@
#include <memory>
-#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/modules/audio_processing/vad/vad_audio_proc_unittest.cc b/modules/audio_processing/vad/vad_audio_proc_unittest.cc
index a8a4ead..1de1b73 100644
--- a/modules/audio_processing/vad/vad_audio_proc_unittest.cc
+++ b/modules/audio_processing/vad/vad_audio_proc_unittest.cc
@@ -19,7 +19,7 @@
#include <string>
-#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/modules/audio_processing/vad/vad_circular_buffer_unittest.cc b/modules/audio_processing/vad/vad_circular_buffer_unittest.cc
index 81c3a2d..5291ff8 100644
--- a/modules/audio_processing/vad/vad_circular_buffer_unittest.cc
+++ b/modules/audio_processing/vad/vad_circular_buffer_unittest.cc
@@ -14,7 +14,7 @@
#include <memory>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/audio_processing/vad/voice_activity_detector_unittest.cc b/modules/audio_processing/vad/voice_activity_detector_unittest.cc
index f4ee177..d43b135 100644
--- a/modules/audio_processing/vad/voice_activity_detector_unittest.cc
+++ b/modules/audio_processing/vad/voice_activity_detector_unittest.cc
@@ -13,7 +13,7 @@
#include <algorithm>
#include <vector>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/modules/audio_processing/voice_detection_unittest.cc b/modules/audio_processing/voice_detection_unittest.cc
index 791bd55..171c1d6 100644
--- a/modules/audio_processing/voice_detection_unittest.cc
+++ b/modules/audio_processing/voice_detection_unittest.cc
@@ -9,7 +9,7 @@
*/
#include <vector>
-#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/modules/bitrate_controller/bitrate_controller_unittest.cc b/modules/bitrate_controller/bitrate_controller_unittest.cc
index 43060e2..7da947b 100644
--- a/modules/bitrate_controller/bitrate_controller_unittest.cc
+++ b/modules/bitrate_controller/bitrate_controller_unittest.cc
@@ -11,7 +11,7 @@
#include <algorithm>
#include <vector>
-#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/modules/bitrate_controller/include/mock/mock_bitrate_controller.h b/modules/bitrate_controller/include/mock/mock_bitrate_controller.h
index dc7e286..ee545f5 100644
--- a/modules/bitrate_controller/include/mock/mock_bitrate_controller.h
+++ b/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/modules/bitrate_controller/send_side_bandwidth_estimation_unittest.cc b/modules/bitrate_controller/send_side_bandwidth_estimation_unittest.cc
index 0a15a41..7368a48 100644
--- a/modules/bitrate_controller/send_side_bandwidth_estimation_unittest.cc
+++ b/modules/bitrate_controller/send_side_bandwidth_estimation_unittest.cc
@@ -11,7 +11,7 @@
#include <algorithm>
#include <vector>
-#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/modules/congestion_controller/congestion_controller_unittest.cc b/modules/congestion_controller/congestion_controller_unittest.cc
index 79cb2ed..8d1005d 100644
--- a/modules/congestion_controller/congestion_controller_unittest.cc
+++ b/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/modules/congestion_controller/delay_based_bwe_unittest.cc b/modules/congestion_controller/delay_based_bwe_unittest.cc
index 6319e98..7220967 100644
--- a/modules/congestion_controller/delay_based_bwe_unittest.cc
+++ b/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/modules/congestion_controller/delay_based_bwe_unittest_helper.h b/modules/congestion_controller/delay_based_bwe_unittest_helper.h
index c91c580..f97cd52 100644
--- a/modules/congestion_controller/delay_based_bwe_unittest_helper.h
+++ b/modules/congestion_controller/delay_based_bwe_unittest_helper.h
@@ -17,7 +17,7 @@
#include <utility>
#include <vector>
-#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/modules/congestion_controller/include/mock/mock_congestion_controller.h b/modules/congestion_controller/include/mock/mock_congestion_controller.h
index f7d4aaa..143efd4 100644
--- a/modules/congestion_controller/include/mock/mock_congestion_controller.h
+++ b/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/modules/congestion_controller/probe_bitrate_estimator_unittest.cc b/modules/congestion_controller/probe_bitrate_estimator_unittest.cc
index e4ec739..cd12b58 100644
--- a/modules/congestion_controller/probe_bitrate_estimator_unittest.cc
+++ b/modules/congestion_controller/probe_bitrate_estimator_unittest.cc
@@ -13,8 +13,8 @@
#include <vector>
#include <utility>
-#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/modules/congestion_controller/probe_controller_unittest.cc b/modules/congestion_controller/probe_controller_unittest.cc
index 9e01660..a57cad0 100644
--- a/modules/congestion_controller/probe_controller_unittest.cc
+++ b/modules/congestion_controller/probe_controller_unittest.cc
@@ -9,8 +9,8 @@
*/
#include <memory>
-#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/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc b/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc
index 9e89439..5e7a02a 100644
--- a/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc
+++ b/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/modules/desktop_capture/desktop_region_unittest.cc b/modules/desktop_capture/desktop_region_unittest.cc
index 3062f0b..16f8626 100644
--- a/modules/desktop_capture/desktop_region_unittest.cc
+++ b/modules/desktop_capture/desktop_region_unittest.cc
@@ -12,7 +12,7 @@
#include <algorithm>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/desktop_capture/differ_block_unittest.cc b/modules/desktop_capture/differ_block_unittest.cc
index 636f453..e981cc1 100644
--- a/modules/desktop_capture/differ_block_unittest.cc
+++ b/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/modules/desktop_capture/mouse_cursor_monitor_unittest.cc b/modules/desktop_capture/mouse_cursor_monitor_unittest.cc
index 35197ef..663e970 100644
--- a/modules/desktop_capture/mouse_cursor_monitor_unittest.cc
+++ b/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/modules/desktop_capture/rgba_color_unittest.cc b/modules/desktop_capture/rgba_color_unittest.cc
index 33e4fb7..dc75021 100644
--- a/modules/desktop_capture/rgba_color_unittest.cc
+++ b/modules/desktop_capture/rgba_color_unittest.cc
@@ -12,7 +12,7 @@
#include <vector>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/modules/desktop_capture/screen_capturer_differ_wrapper_unittest.cc b/modules/desktop_capture/screen_capturer_differ_wrapper_unittest.cc
index e667553..0aad0e0 100644
--- a/modules/desktop_capture/screen_capturer_differ_wrapper_unittest.cc
+++ b/modules/desktop_capture/screen_capturer_differ_wrapper_unittest.cc
@@ -15,7 +15,7 @@
#include <utility>
#include <vector>
-#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/modules/desktop_capture/screen_capturer_helper_unittest.cc b/modules/desktop_capture/screen_capturer_helper_unittest.cc
index 13388b4..76e7eb3 100644
--- a/modules/desktop_capture/screen_capturer_helper_unittest.cc
+++ b/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/modules/desktop_capture/screen_capturer_mac_unittest.cc b/modules/desktop_capture/screen_capturer_mac_unittest.cc
index 47e7219..7b83a83 100644
--- a/modules/desktop_capture/screen_capturer_mac_unittest.cc
+++ b/modules/desktop_capture/screen_capturer_mac_unittest.cc
@@ -15,7 +15,7 @@
#include <memory>
#include <ostream>
-#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/modules/desktop_capture/screen_capturer_mock_objects.h b/modules/desktop_capture/screen_capturer_mock_objects.h
index 1f17e8c..82944a7 100644
--- a/modules/desktop_capture/screen_capturer_mock_objects.h
+++ b/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/modules/desktop_capture/screen_capturer_unittest.cc b/modules/desktop_capture/screen_capturer_unittest.cc
index 6a70dc2..fa666a9 100644
--- a/modules/desktop_capture/screen_capturer_unittest.cc
+++ b/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/modules/desktop_capture/screen_drawer_unittest.cc b/modules/desktop_capture/screen_drawer_unittest.cc
index b5f6ba5..499c690 100644
--- a/modules/desktop_capture/screen_drawer_unittest.cc
+++ b/modules/desktop_capture/screen_drawer_unittest.cc
@@ -12,7 +12,7 @@
#include <stdint.h>
-#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/modules/desktop_capture/win/cursor_unittest.cc b/modules/desktop_capture/win/cursor_unittest.cc
index 4d52f70..21ea303 100644
--- a/modules/desktop_capture/win/cursor_unittest.cc
+++ b/modules/desktop_capture/win/cursor_unittest.cc
@@ -10,7 +10,7 @@
#include <memory>
-#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/modules/desktop_capture/window_capturer_unittest.cc b/modules/desktop_capture/window_capturer_unittest.cc
index d2d326e..1a8e4d0 100644
--- a/modules/desktop_capture/window_capturer_unittest.cc
+++ b/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/modules/media_file/media_file_unittest.cc b/modules/media_file/media_file_unittest.cc
index 6541a8f..3fa0afc 100644
--- a/modules/media_file/media_file_unittest.cc
+++ b/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/modules/module_common_types_unittest.cc b/modules/module_common_types_unittest.cc
index acd5847..148263c 100644
--- a/modules/module_common_types_unittest.cc
+++ b/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/modules/pacing/bitrate_prober_unittest.cc b/modules/pacing/bitrate_prober_unittest.cc
index 422bd27..e0318df 100644
--- a/modules/pacing/bitrate_prober_unittest.cc
+++ b/modules/pacing/bitrate_prober_unittest.cc
@@ -10,7 +10,7 @@
#include <limits>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/modules/pacing/bitrate_prober.h"
namespace webrtc {
diff --git a/modules/pacing/mock/mock_paced_sender.h b/modules/pacing/mock/mock_paced_sender.h
index e429962..15f5f0a 100644
--- a/modules/pacing/mock/mock_paced_sender.h
+++ b/modules/pacing/mock/mock_paced_sender.h
@@ -13,7 +13,7 @@
#include <vector>
-#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/modules/pacing/paced_sender_unittest.cc b/modules/pacing/paced_sender_unittest.cc
index 8614525..4d859c7 100644
--- a/modules/pacing/paced_sender_unittest.cc
+++ b/modules/pacing/paced_sender_unittest.cc
@@ -11,8 +11,8 @@
#include <list>
#include <memory>
-#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/modules/pacing/packet_router_unittest.cc b/modules/pacing/packet_router_unittest.cc
index 5c1654e..bfd644d 100644
--- a/modules/pacing/packet_router_unittest.cc
+++ b/modules/pacing/packet_router_unittest.cc
@@ -12,8 +12,8 @@
#include <memory>
#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/modules/remote_bitrate_estimator/bwe_simulations.cc b/modules/remote_bitrate_estimator/bwe_simulations.cc
index d44788b..b0621ef 100644
--- a/modules/remote_bitrate_estimator/bwe_simulations.cc
+++ b/modules/remote_bitrate_estimator/bwe_simulations.cc
@@ -10,7 +10,7 @@
#include <memory>
-#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/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h b/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h
index 6177303..b65d424 100644
--- a/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h
+++ b/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h
@@ -13,7 +13,7 @@
#include <vector>
-#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/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_observer.h b/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_observer.h
index ae05912..8820396 100644
--- a/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_observer.h
+++ b/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_observer.h
@@ -13,7 +13,7 @@
#include <vector>
-#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/modules/remote_bitrate_estimator/inter_arrival_unittest.cc b/modules/remote_bitrate_estimator/inter_arrival_unittest.cc
index f255285..5ee72d2 100644
--- a/modules/remote_bitrate_estimator/inter_arrival_unittest.cc
+++ b/modules/remote_bitrate_estimator/inter_arrival_unittest.cc
@@ -10,7 +10,7 @@
#include <memory>
-#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/modules/remote_bitrate_estimator/overuse_detector_unittest.cc b/modules/remote_bitrate_estimator/overuse_detector_unittest.cc
index 6f3f3e7..cfcf2d6 100644
--- a/modules/remote_bitrate_estimator/overuse_detector_unittest.cc
+++ b/modules/remote_bitrate_estimator/overuse_detector_unittest.cc
@@ -15,7 +15,7 @@
#include <cstdlib>
#include <memory>
-#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/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h b/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h
index 4822d40..5a3a524 100644
--- a/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h
+++ b/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h
@@ -17,7 +17,7 @@
#include <utility>
#include <vector>
-#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/modules/remote_bitrate_estimator/remote_estimator_proxy_unittest.cc b/modules/remote_bitrate_estimator/remote_estimator_proxy_unittest.cc
index 8b8bab4..7b831db 100644
--- a/modules/remote_bitrate_estimator/remote_estimator_proxy_unittest.cc
+++ b/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/modules/remote_bitrate_estimator/send_time_history_unittest.cc b/modules/remote_bitrate_estimator/send_time_history_unittest.cc
index 78ee6b7..96e6d27 100644
--- a/modules/remote_bitrate_estimator/send_time_history_unittest.cc
+++ b/modules/remote_bitrate_estimator/send_time_history_unittest.cc
@@ -12,7 +12,7 @@
#include <limits>
#include <vector>
-#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/modules/remote_bitrate_estimator/test/bwe_test.h b/modules/remote_bitrate_estimator/test/bwe_test.h
index 5fb3252..b11ea1a 100644
--- a/modules/remote_bitrate_estimator/test/bwe_test.h
+++ b/modules/remote_bitrate_estimator/test/bwe_test.h
@@ -14,7 +14,7 @@
#include <map>
#include <string>
#include <vector>
-#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/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc b/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc
index 254ee0e..a06838a 100644
--- a/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc
+++ b/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc
@@ -12,7 +12,7 @@
#include <numeric>
-#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/modules/remote_bitrate_estimator/test/bwe_unittest.cc b/modules/remote_bitrate_estimator/test/bwe_unittest.cc
index 6245ccd..c2c87f9 100644
--- a/modules/remote_bitrate_estimator/test/bwe_unittest.cc
+++ b/modules/remote_bitrate_estimator/test/bwe_unittest.cc
@@ -12,7 +12,7 @@
#include <vector>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/base/arraysize.h"
namespace webrtc {
diff --git a/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc b/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc
index 7feaeed..78196df 100644
--- a/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc
+++ b/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/modules/remote_bitrate_estimator/test/estimators/remb.cc b/modules/remote_bitrate_estimator/test/estimators/remb.cc
index c12b269..f5a9eaf 100644
--- a/modules/remote_bitrate_estimator/test/estimators/remb.cc
+++ b/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/modules/remote_bitrate_estimator/test/estimators/tcp.cc b/modules/remote_bitrate_estimator/test/estimators/tcp.cc
index b7e4f97..e7d3a10 100644
--- a/modules/remote_bitrate_estimator/test/estimators/tcp.cc
+++ b/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/modules/remote_bitrate_estimator/test/metric_recorder_unittest.cc b/modules/remote_bitrate_estimator/test/metric_recorder_unittest.cc
index 7d4ed5f..e8f291c 100644
--- a/modules/remote_bitrate_estimator/test/metric_recorder_unittest.cc
+++ b/modules/remote_bitrate_estimator/test/metric_recorder_unittest.cc
@@ -14,7 +14,7 @@
#include <algorithm>
#include <vector>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace testing {
diff --git a/modules/remote_bitrate_estimator/test/packet_receiver.cc b/modules/remote_bitrate_estimator/test/packet_receiver.cc
index 793e064..d0be605 100644
--- a/modules/remote_bitrate_estimator/test/packet_receiver.cc
+++ b/modules/remote_bitrate_estimator/test/packet_receiver.cc
@@ -12,7 +12,7 @@
#include <vector>
-#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/modules/remote_bitrate_estimator/transport_feedback_adapter_unittest.cc b/modules/remote_bitrate_estimator/transport_feedback_adapter_unittest.cc
index e2755b3..b312f96 100644
--- a/modules/remote_bitrate_estimator/transport_feedback_adapter_unittest.cc
+++ b/modules/remote_bitrate_estimator/transport_feedback_adapter_unittest.cc
@@ -12,8 +12,8 @@
#include <memory>
#include <vector>
-#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/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h b/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
index 6834da3..01f5d82 100644
--- a/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
+++ b/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
@@ -15,7 +15,7 @@
#include <utility>
#include <vector>
-#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/modules/rtp_rtcp/source/byte_io_unittest.cc b/modules/rtp_rtcp/source/byte_io_unittest.cc
index 00b63eb..6d3327f 100644
--- a/modules/rtp_rtcp/source/byte_io_unittest.cc
+++ b/modules/rtp_rtcp/source/byte_io_unittest.cc
@@ -10,7 +10,7 @@
#include <limits>
-#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/modules/rtp_rtcp/source/fec_receiver_unittest.cc b/modules/rtp_rtcp/source/fec_receiver_unittest.cc
index d2e1ce7..fe0abdc 100644
--- a/modules/rtp_rtcp/source/fec_receiver_unittest.cc
+++ b/modules/rtp_rtcp/source/fec_receiver_unittest.cc
@@ -13,8 +13,8 @@
#include <list>
#include <memory>
-#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/modules/rtp_rtcp/source/mock/mock_rtp_payload_strategy.h b/modules/rtp_rtcp/source/mock/mock_rtp_payload_strategy.h
index 25b56e7..e5e9f46 100644
--- a/modules/rtp_rtcp/source/mock/mock_rtp_payload_strategy.h
+++ b/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/modules/rtp_rtcp/source/nack_rtx_unittest.cc b/modules/rtp_rtcp/source/nack_rtx_unittest.cc
index 052060c..85de611 100644
--- a/modules/rtp_rtcp/source/nack_rtx_unittest.cc
+++ b/modules/rtp_rtcp/source/nack_rtx_unittest.cc
@@ -14,7 +14,7 @@
#include <memory>
#include <set>
-#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/modules/rtp_rtcp/source/packet_loss_stats_unittest.cc b/modules/rtp_rtcp/source/packet_loss_stats_unittest.cc
index 6606282..6e7ea03 100644
--- a/modules/rtp_rtcp/source/packet_loss_stats_unittest.cc
+++ b/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/modules/rtp_rtcp/source/playout_delay_oracle_unittest.cc b/modules/rtp_rtcp/source/playout_delay_oracle_unittest.cc
index 17e0185..0d38f3f 100644
--- a/modules/rtp_rtcp/source/playout_delay_oracle_unittest.cc
+++ b/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/modules/rtp_rtcp/source/producer_fec_unittest.cc b/modules/rtp_rtcp/source/producer_fec_unittest.cc
index ae51605..023a24c 100644
--- a/modules/rtp_rtcp/source/producer_fec_unittest.cc
+++ b/modules/rtp_rtcp/source/producer_fec_unittest.cc
@@ -12,7 +12,7 @@
#include <memory>
#include <vector>
-#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/modules/rtp_rtcp/source/receive_statistics_unittest.cc b/modules/rtp_rtcp/source/receive_statistics_unittest.cc
index f6cbe74..c3d7757 100644
--- a/modules/rtp_rtcp/source/receive_statistics_unittest.cc
+++ b/modules/rtp_rtcp/source/receive_statistics_unittest.cc
@@ -10,8 +10,8 @@
#include <memory>
-#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/modules/rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc b/modules/rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc
index 797c788..0103547 100644
--- a/modules/rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc
+++ b/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/modules/rtp_rtcp/source/rtcp_packet/app_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/app_unittest.cc
index 6015ab8..91783d0 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/app_unittest.cc
+++ b/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/modules/rtp_rtcp/source/rtcp_packet/bye_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/bye_unittest.cc
index c90566b..cc97867 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/bye_unittest.cc
+++ b/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/modules/rtp_rtcp/source/rtcp_packet/common_header_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/common_header_unittest.cc
index d83de14..f224226 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/common_header_unittest.cc
+++ b/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/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc
index 5e2c7df..b42ec0c 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc
+++ b/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/modules/rtp_rtcp/source/rtcp_packet/dlrr_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/dlrr_unittest.cc
index 469a466..bf5756d 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/dlrr_unittest.cc
+++ b/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/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report_unittest.cc
index f1ce6a9..39eb931 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report_unittest.cc
+++ b/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/modules/rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc
index 8cb144d..53b81cf 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc
+++ b/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/modules/rtp_rtcp/source/rtcp_packet/fir_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/fir_unittest.cc
index bce5f95..7680fcb 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/fir_unittest.cc
+++ b/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/modules/rtp_rtcp/source/rtcp_packet/nack_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/nack_unittest.cc
index a992019..f523598 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/nack_unittest.cc
+++ b/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/modules/rtp_rtcp/source/rtcp_packet/pli_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/pli_unittest.cc
index f751822..6f32482 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/pli_unittest.cc
+++ b/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/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request_unittest.cc
index 8dcc46d..5564186 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request_unittest.cc
+++ b/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/modules/rtp_rtcp/source/rtcp_packet/receiver_report_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/receiver_report_unittest.cc
index 5e28ff4..4061db8 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/receiver_report_unittest.cc
+++ b/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/modules/rtp_rtcp/source/rtcp_packet/remb_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/remb_unittest.cc
index af4c5b4..f7b1dcf 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/remb_unittest.cc
+++ b/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/modules/rtp_rtcp/source/rtcp_packet/report_block_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/report_block_unittest.cc
index 957a08f..ab6254b 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/report_block_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/report_block_unittest.cc
@@ -12,7 +12,7 @@
#include <limits>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/base/random.h"
using webrtc::rtcp::ReportBlock;
diff --git a/modules/rtp_rtcp/source/rtcp_packet/rpsi_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/rpsi_unittest.cc
index 9268e19..1410079 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/rpsi_unittest.cc
+++ b/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/modules/rtp_rtcp/source/rtcp_packet/rrtr_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/rrtr_unittest.cc
index 6dff06f..70bfe0b 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/rrtr_unittest.cc
+++ b/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/modules/rtp_rtcp/source/rtcp_packet/sdes_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/sdes_unittest.cc
index 206558a..13b28ea 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/sdes_unittest.cc
+++ b/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/modules/rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc
index 6611991..d69b53f 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc
+++ b/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/modules/rtp_rtcp/source/rtcp_packet/sli_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/sli_unittest.cc
index 4b2fdea..8468100 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/sli_unittest.cc
+++ b/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/modules/rtp_rtcp/source/rtcp_packet/tmmbn_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/tmmbn_unittest.cc
index e2a3aca..c85cc10 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/tmmbn_unittest.cc
+++ b/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/modules/rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc
index 415ca94..0126468 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc
+++ b/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/modules/rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc
index 5387330..db23c71 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc
@@ -13,7 +13,7 @@
#include <limits>
#include <memory>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
diff --git a/modules/rtp_rtcp/source/rtcp_packet/voip_metric_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/voip_metric_unittest.cc
index d12889d..803d41d 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/voip_metric_unittest.cc
+++ b/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/modules/rtp_rtcp/source/rtcp_packet_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet_unittest.cc
index 082d1c7..7a5a191 100644
--- a/modules/rtp_rtcp/source/rtcp_packet_unittest.cc
+++ b/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/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc b/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
index 6a393cd..dd1dc50 100644
--- a/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
@@ -10,8 +10,8 @@
#include <memory>
-#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/modules/rtp_rtcp/source/rtcp_sender_unittest.cc b/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
index 60abb6f..a6ad770 100644
--- a/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
@@ -10,8 +10,8 @@
#include <memory>
-#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/modules/rtp_rtcp/source/rtcp_utility_unittest.cc b/modules/rtp_rtcp/source/rtcp_utility_unittest.cc
index 1a13812..9223912 100644
--- a/modules/rtp_rtcp/source/rtcp_utility_unittest.cc
+++ b/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/modules/rtp_rtcp/source/rtp_fec_unittest.cc b/modules/rtp_rtcp/source/rtp_fec_unittest.cc
index a95c2cb..fd00dc7 100644
--- a/modules/rtp_rtcp/source/rtp_fec_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_fec_unittest.cc
@@ -12,7 +12,7 @@
#include <list>
#include <memory>
-#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/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc b/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc
index e84d5f9..a5650f6 100644
--- a/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc
@@ -11,8 +11,8 @@
#include <memory>
#include <vector>
-#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/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.cc b/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.cc
index a62f496..5105659 100644
--- a/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.cc
+++ b/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/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc b/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc
index 079d964..ccaf826 100644
--- a/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc
@@ -10,8 +10,8 @@
#include <memory>
-#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/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc b/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc
index f9514ad..6a9fe8b 100644
--- a/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc
@@ -11,8 +11,8 @@
#include <memory>
#include <vector>
-#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/modules/rtp_rtcp/source/rtp_header_extension_unittest.cc b/modules/rtp_rtcp/source/rtp_header_extension_unittest.cc
index 0b4f893..a8c7664 100644
--- a/modules/rtp_rtcp/source/rtp_header_extension_unittest.cc
+++ b/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/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc b/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc
index 05b2311..ab9b949 100644
--- a/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc
@@ -12,7 +12,7 @@
#include <memory>
-#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/modules/rtp_rtcp/source/rtp_packet_unittest.cc b/modules/rtp_rtcp/source/rtp_packet_unittest.cc
index 010d57b..2991aee 100644
--- a/modules/rtp_rtcp/source/rtp_packet_unittest.cc
+++ b/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/modules/rtp_rtcp/source/rtp_payload_registry_unittest.cc b/modules/rtp_rtcp/source/rtp_payload_registry_unittest.cc
index 5bbe97a..98d074d 100644
--- a/modules/rtp_rtcp/source/rtp_payload_registry_unittest.cc
+++ b/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/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc
index b43f95d..5049721 100644
--- a/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc
@@ -12,8 +12,8 @@
#include <memory>
#include <set>
-#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/modules/rtp_rtcp/source/rtp_sender_unittest.cc b/modules/rtp_rtcp/source/rtp_sender_unittest.cc
index 2cd1596..0afa817 100644
--- a/modules/rtp_rtcp/source/rtp_sender_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_sender_unittest.cc
@@ -11,8 +11,8 @@
#include <memory>
#include <vector>
-#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/modules/rtp_rtcp/source/time_util_unittest.cc b/modules/rtp_rtcp/source/time_util_unittest.cc
index 8333a64..54733b3 100644
--- a/modules/rtp_rtcp/source/time_util_unittest.cc
+++ b/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/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc b/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc
index 9eb2df0..6edbdb3 100644
--- a/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc
+++ b/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc
@@ -13,7 +13,7 @@
#include <memory>
#include <utility>
-#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/modules/rtp_rtcp/source/vp8_partition_aggregator_unittest.cc b/modules/rtp_rtcp/source/vp8_partition_aggregator_unittest.cc
index 726d83e..eb35692 100644
--- a/modules/rtp_rtcp/source/vp8_partition_aggregator_unittest.cc
+++ b/modules/rtp_rtcp/source/vp8_partition_aggregator_unittest.cc
@@ -10,7 +10,7 @@
#include <stdlib.h> // 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/modules/rtp_rtcp/test/testAPI/test_api.h b/modules/rtp_rtcp/test/testAPI/test_api.h
index 2962dd3..cbc5f17 100644
--- a/modules/rtp_rtcp/test/testAPI/test_api.h
+++ b/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/modules/rtp_rtcp/test/testAPI/test_api_audio.cc b/modules/rtp_rtcp/test/testAPI/test_api_audio.cc
index 291dded..7d72478 100644
--- a/modules/rtp_rtcp/test/testAPI/test_api_audio.cc
+++ b/modules/rtp_rtcp/test/testAPI/test_api_audio.cc
@@ -11,7 +11,7 @@
#include <algorithm>
#include <memory>
#include <vector>
-#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/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc b/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc
index e19cf35..cea85dd 100644
--- a/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc
+++ b/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc
@@ -12,8 +12,8 @@
#include <memory>
#include <vector>
-#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/modules/rtp_rtcp/test/testAPI/test_api_video.cc b/modules/rtp_rtcp/test/testAPI/test_api_video.cc
index a701c9e..80ec4ce 100644
--- a/modules/rtp_rtcp/test/testAPI/test_api_video.cc
+++ b/modules/rtp_rtcp/test/testAPI/test_api_video.cc
@@ -14,7 +14,7 @@
#include <memory>
#include <vector>
-#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/modules/rtp_rtcp/test/testFec/test_fec.cc b/modules/rtp_rtcp/test/testFec/test_fec.cc
index e3368e2..971ccc5 100644
--- a/modules/rtp_rtcp/test/testFec/test_fec.cc
+++ b/modules/rtp_rtcp/test/testFec/test_fec.cc
@@ -18,7 +18,7 @@
#include <list>
-#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/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc b/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc
index 0b4ac25..edbe15f 100644
--- a/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc
+++ b/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc
@@ -47,7 +47,7 @@
#include <memory>
-#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/modules/utility/include/mock/mock_process_thread.h b/modules/utility/include/mock/mock_process_thread.h
index c6520bb..6625a74 100644
--- a/modules/utility/include/mock/mock_process_thread.h
+++ b/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/modules/utility/source/audio_frame_operations_unittest.cc b/modules/utility/source/audio_frame_operations_unittest.cc
index 1d77e8f..67ee798 100644
--- a/modules/utility/source/audio_frame_operations_unittest.cc
+++ b/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/modules/utility/source/file_player_unittests.cc b/modules/utility/source/file_player_unittests.cc
index 337c634..8adbdd3 100644
--- a/modules/utility/source/file_player_unittests.cc
+++ b/modules/utility/source/file_player_unittests.cc
@@ -18,7 +18,7 @@
#include <string>
#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/modules/utility/source/helpers_ios.mm b/modules/utility/source/helpers_ios.mm
index 2afcb29..5e827a8 100644
--- a/modules/utility/source/helpers_ios.mm
+++ b/modules/utility/source/helpers_ios.mm
@@ -178,7 +178,8 @@
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/modules/utility/source/process_thread_impl_unittest.cc b/modules/utility/source/process_thread_impl_unittest.cc
index ec3b5a1..567ed4b 100644
--- a/modules/utility/source/process_thread_impl_unittest.cc
+++ b/modules/utility/source/process_thread_impl_unittest.cc
@@ -11,8 +11,8 @@
#include <memory>
#include <utility>
-#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/modules/video_capture/objc/rtc_video_capture_objc.mm b/modules/video_capture/objc/rtc_video_capture_objc.mm
index a2af4af..10671eb 100644
--- a/modules/video_capture/objc/rtc_video_capture_objc.mm
+++ b/modules/video_capture/objc/rtc_video_capture_objc.mm
@@ -47,7 +47,8 @@
_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/modules/video_capture/test/video_capture_main_mac.mm b/modules/video_capture/test/video_capture_main_mac.mm
index 15cd1d5..6d6d5c6 100644
--- a/modules/video_capture/test/video_capture_main_mac.mm
+++ b/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/modules/video_capture/test/video_capture_unittest.cc b/modules/video_capture/test/video_capture_unittest.cc
index 10f3a2b..4cc06cf 100644
--- a/modules/video_capture/test/video_capture_unittest.cc
+++ b/modules/video_capture/test/video_capture_unittest.cc
@@ -14,7 +14,7 @@
#include <memory>
#include <sstream>
-#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 @@
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 @@
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/modules/video_coding/codecs/h264/h264_video_toolbox_nalu_unittest.cc b/modules/video_coding/codecs/h264/h264_video_toolbox_nalu_unittest.cc
index a263707..44a963e 100644
--- a/modules/video_coding/codecs/h264/h264_video_toolbox_nalu_unittest.cc
+++ b/modules/video_coding/codecs/h264/h264_video_toolbox_nalu_unittest.cc
@@ -11,7 +11,7 @@
#include <memory>
-#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/modules/video_coding/codecs/h264/include/h264.h b/modules/video_coding/codecs/h264/include/h264.h
index 2c404b2..54ad6eb 100644
--- a/modules/video_coding/codecs/h264/include/h264.h
+++ b/modules/video_coding/codecs/h264/include/h264.h
@@ -15,8 +15,8 @@
#if defined(WEBRTC_IOS) || defined(WEBRTC_MAC)
#include <Availability.h>
-#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/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h b/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h
index cdee8c5..c40993d 100644
--- a/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h
+++ b/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h
@@ -16,7 +16,7 @@
#include <string>
#include <vector>
-#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/modules/video_coding/codecs/test/mock/mock_packet_manipulator.h b/modules/video_coding/codecs/test/mock/mock_packet_manipulator.h
index 1e2c9b8..4096a93 100644
--- a/modules/video_coding/codecs/test/mock/mock_packet_manipulator.h
+++ b/modules/video_coding/codecs/test/mock/mock_packet_manipulator.h
@@ -15,7 +15,7 @@
#include <string>
-#include "testing/gmock/include/gmock/gmock.h"
+#include "webrtc/test/gmock.h"
#include "webrtc/typedefs.h"
#include "webrtc/video_frame.h"
diff --git a/modules/video_coding/codecs/test/packet_manipulator_unittest.cc b/modules/video_coding/codecs/test/packet_manipulator_unittest.cc
index 8c3d30d..3b9b17e 100644
--- a/modules/video_coding/codecs/test/packet_manipulator_unittest.cc
+++ b/modules/video_coding/codecs/test/packet_manipulator_unittest.cc
@@ -12,7 +12,7 @@
#include <queue>
-#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/modules/video_coding/codecs/test/stats_unittest.cc b/modules/video_coding/codecs/test/stats_unittest.cc
index 0403ccf..ed85252 100644
--- a/modules/video_coding/codecs/test/stats_unittest.cc
+++ b/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/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc b/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
index cd76aa5..214020b 100644
--- a/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
+++ b/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
@@ -10,7 +10,7 @@
#include <math.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/codecs/test/packet_manipulator.h"
diff --git a/modules/video_coding/codecs/test/videoprocessor_unittest.cc b/modules/video_coding/codecs/test/videoprocessor_unittest.cc
index 148d8dc..77ea472 100644
--- a/modules/video_coding/codecs/test/videoprocessor_unittest.cc
+++ b/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/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc b/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc
index 461ba69..2290fe3 100644
--- a/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc
+++ b/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/modules/video_coding/codecs/vp8/reference_picture_selection_unittest.cc b/modules/video_coding/codecs/vp8/reference_picture_selection_unittest.cc
index 742bb96..082634f 100644
--- a/modules/video_coding/codecs/vp8/reference_picture_selection_unittest.cc
+++ b/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/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc b/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
index 2711de0..b6ffcba 100644
--- a/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
+++ b/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
@@ -11,7 +11,7 @@
#include <memory>
#include <vector>
-#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/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc b/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc
index d13dbb1..1fa06f6 100644
--- a/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc
+++ b/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc
@@ -11,7 +11,7 @@
#include <memory>
#include <vector>
-#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/modules/video_coding/codecs/vp8/simulcast_unittest.h b/modules/video_coding/codecs/vp8/simulcast_unittest.h
index 4aefb38..cc14819 100644
--- a/modules/video_coding/codecs/vp8/simulcast_unittest.h
+++ b/modules/video_coding/codecs/vp8/simulcast_unittest.h
@@ -15,7 +15,7 @@
#include <memory>
#include <vector>
-#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/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc b/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
index 4f3d99b..252eb71 100644
--- a/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
+++ b/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
@@ -12,7 +12,7 @@
#include <memory>
-#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/modules/video_coding/codecs/vp8/vp8_sequence_coder.cc b/modules/video_coding/codecs/vp8/vp8_sequence_coder.cc
index dcc0619..8a374db 100644
--- a/modules/video_coding/codecs/vp8/vp8_sequence_coder.cc
+++ b/modules/video_coding/codecs/vp8/vp8_sequence_coder.cc
@@ -10,7 +10,7 @@
#include <memory>
-#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/modules/video_coding/codecs/vp9/vp9_screenshare_layers_unittest.cc b/modules/video_coding/codecs/vp9/vp9_screenshare_layers_unittest.cc
index 4708172..7038a19 100644
--- a/modules/video_coding/codecs/vp9/vp9_screenshare_layers_unittest.cc
+++ b/modules/video_coding/codecs/vp9/vp9_screenshare_layers_unittest.cc
@@ -11,7 +11,7 @@
#include <limits>
#include <memory>
-#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/modules/video_coding/decoding_state_unittest.cc b/modules/video_coding/decoding_state_unittest.cc
index 3942dab..5d9733c 100644
--- a/modules/video_coding/decoding_state_unittest.cc
+++ b/modules/video_coding/decoding_state_unittest.cc
@@ -10,7 +10,7 @@
#include <string.h>
-#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/modules/video_coding/frame_buffer2_unittest.cc b/modules/video_coding/frame_buffer2_unittest.cc
index 46cccad..1397aeb 100644
--- a/modules/video_coding/frame_buffer2_unittest.cc
+++ b/modules/video_coding/frame_buffer2_unittest.cc
@@ -15,8 +15,8 @@
#include <limits>
#include <vector>
-#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/modules/video_coding/histogram_unittest.cc b/modules/video_coding/histogram_unittest.cc
index ac79ac4..c1089ba 100644
--- a/modules/video_coding/histogram_unittest.cc
+++ b/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/modules/video_coding/include/mock/mock_vcm_callbacks.h b/modules/video_coding/include/mock/mock_vcm_callbacks.h
index 0185dae..3aefea3 100644
--- a/modules/video_coding/include/mock/mock_vcm_callbacks.h
+++ b/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/modules/video_coding/include/mock/mock_video_codec_interface.h b/modules/video_coding/include/mock/mock_video_codec_interface.h
index 20f76cc..c6665d7 100644
--- a/modules/video_coding/include/mock/mock_video_codec_interface.h
+++ b/modules/video_coding/include/mock/mock_video_codec_interface.h
@@ -14,7 +14,7 @@
#include <string>
#include <vector>
-#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/modules/video_coding/jitter_buffer_unittest.cc b/modules/video_coding/jitter_buffer_unittest.cc
index 0dc3271..c7108c1 100644
--- a/modules/video_coding/jitter_buffer_unittest.cc
+++ b/modules/video_coding/jitter_buffer_unittest.cc
@@ -13,8 +13,8 @@
#include <list>
#include <memory>
-#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/modules/video_coding/jitter_estimator_tests.cc b/modules/video_coding/jitter_estimator_tests.cc
index 3d46ce2..1a9afbf 100644
--- a/modules/video_coding/jitter_estimator_tests.cc
+++ b/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/modules/video_coding/nack_module_unittest.cc b/modules/video_coding/nack_module_unittest.cc
index 9c2eb4a..b11a4ad 100644
--- a/modules/video_coding/nack_module_unittest.cc
+++ b/modules/video_coding/nack_module_unittest.cc
@@ -11,7 +11,7 @@
#include <cstring>
#include <memory>
-#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/modules/video_coding/percentile_filter_unittest.cc b/modules/video_coding/percentile_filter_unittest.cc
index 8029bdb..1e1fa96 100644
--- a/modules/video_coding/percentile_filter_unittest.cc
+++ b/modules/video_coding/percentile_filter_unittest.cc
@@ -10,7 +10,7 @@
#include <algorithm>
-#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/modules/video_coding/protection_bitrate_calculator_unittest.cc b/modules/video_coding/protection_bitrate_calculator_unittest.cc
index 151873a..b442bba 100644
--- a/modules/video_coding/protection_bitrate_calculator_unittest.cc
+++ b/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/modules/video_coding/receiver_unittest.cc b/modules/video_coding/receiver_unittest.cc
index b2a3a36..86ce036 100644
--- a/modules/video_coding/receiver_unittest.cc
+++ b/modules/video_coding/receiver_unittest.cc
@@ -14,7 +14,7 @@
#include <queue>
#include <vector>
-#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/modules/video_coding/rtp_frame_reference_finder_unittest.cc b/modules/video_coding/rtp_frame_reference_finder_unittest.cc
index 1efd1c3..606295f 100644
--- a/modules/video_coding/rtp_frame_reference_finder_unittest.cc
+++ b/modules/video_coding/rtp_frame_reference_finder_unittest.cc
@@ -14,7 +14,7 @@
#include <set>
#include <utility>
-#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/modules/video_coding/sequence_number_util_unittest.cc b/modules/video_coding/sequence_number_util_unittest.cc
index 8028efd..4174335 100644
--- a/modules/video_coding/sequence_number_util_unittest.cc
+++ b/modules/video_coding/sequence_number_util_unittest.cc
@@ -10,7 +10,7 @@
#include <set>
-#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/modules/video_coding/session_info_unittest.cc b/modules/video_coding/session_info_unittest.cc
index 4019d63..2cdc25f 100644
--- a/modules/video_coding/session_info_unittest.cc
+++ b/modules/video_coding/session_info_unittest.cc
@@ -10,7 +10,7 @@
#include <string.h>
-#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/modules/video_coding/test/stream_generator.cc b/modules/video_coding/test/stream_generator.cc
index 167d55f..b9bd51a 100644
--- a/modules/video_coding/test/stream_generator.cc
+++ b/modules/video_coding/test/stream_generator.cc
@@ -14,7 +14,7 @@
#include <list>
-#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/modules/video_coding/timing_unittest.cc b/modules/video_coding/timing_unittest.cc
index 3e3b642..88fb3d7 100644
--- a/modules/video_coding/timing_unittest.cc
+++ b/modules/video_coding/timing_unittest.cc
@@ -12,7 +12,7 @@
#include <stdio.h>
#include <stdlib.h>
-#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/modules/video_coding/utility/frame_dropper_unittest.cc b/modules/video_coding/utility/frame_dropper_unittest.cc
index 1663543..b5e2f45 100644
--- a/modules/video_coding/utility/frame_dropper_unittest.cc
+++ b/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/modules/video_coding/utility/h264_bitstream_parser_unittest.cc b/modules/video_coding/utility/h264_bitstream_parser_unittest.cc
index ebc4467..fbacd3b 100644
--- a/modules/video_coding/utility/h264_bitstream_parser_unittest.cc
+++ b/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/modules/video_coding/utility/ivf_file_writer_unittest.cc b/modules/video_coding/utility/ivf_file_writer_unittest.cc
index e5da48c..e4017d1 100644
--- a/modules/video_coding/utility/ivf_file_writer_unittest.cc
+++ b/modules/video_coding/utility/ivf_file_writer_unittest.cc
@@ -12,7 +12,7 @@
#include <memory>
-#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/modules/video_coding/utility/mock/mock_frame_dropper.h b/modules/video_coding/utility/mock/mock_frame_dropper.h
index b68a4b8..d339922 100644
--- a/modules/video_coding/utility/mock/mock_frame_dropper.h
+++ b/modules/video_coding/utility/mock/mock_frame_dropper.h
@@ -12,7 +12,7 @@
#include <string>
-#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/modules/video_coding/utility/moving_average_unittest.cc b/modules/video_coding/utility/moving_average_unittest.cc
index fa32a45..77c3adf 100644
--- a/modules/video_coding/utility/moving_average_unittest.cc
+++ b/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/modules/video_coding/utility/quality_scaler_unittest.cc b/modules/video_coding/utility/quality_scaler_unittest.cc
index 2bbd26d..24d5c48 100644
--- a/modules/video_coding/utility/quality_scaler_unittest.cc
+++ b/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/modules/video_coding/utility/simulcast_rate_allocator_unittest.cc b/modules/video_coding/utility/simulcast_rate_allocator_unittest.cc
index a4af36f..7a616d9 100644
--- a/modules/video_coding/utility/simulcast_rate_allocator_unittest.cc
+++ b/modules/video_coding/utility/simulcast_rate_allocator_unittest.cc
@@ -13,7 +13,7 @@
#include <limits>
#include <memory>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace {
diff --git a/modules/video_coding/video_coding_robustness_unittest.cc b/modules/video_coding/video_coding_robustness_unittest.cc
index b8e0f5d..fd3b50b 100644
--- a/modules/video_coding/video_coding_robustness_unittest.cc
+++ b/modules/video_coding/video_coding_robustness_unittest.cc
@@ -10,8 +10,8 @@
#include <memory>
-#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/modules/video_coding/video_packet_buffer_unittest.cc b/modules/video_coding/video_packet_buffer_unittest.cc
index f4ae5c7..53b7a57 100644
--- a/modules/video_coding/video_packet_buffer_unittest.cc
+++ b/modules/video_coding/video_packet_buffer_unittest.cc
@@ -13,7 +13,7 @@
#include <set>
#include <utility>
-#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/modules/video_coding/video_receiver_unittest.cc b/modules/video_coding/video_receiver_unittest.cc
index 3c41405..f3c1ccc 100644
--- a/modules/video_coding/video_receiver_unittest.cc
+++ b/modules/video_coding/video_receiver_unittest.cc
@@ -11,7 +11,7 @@
#include <memory>
#include <vector>
-#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/modules/video_coding/video_sender_unittest.cc b/modules/video_coding/video_sender_unittest.cc
index a3766c1..b5ffabf 100644
--- a/modules/video_coding/video_sender_unittest.cc
+++ b/modules/video_coding/video_sender_unittest.cc
@@ -11,7 +11,7 @@
#include <memory>
#include <vector>
-#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/modules/video_processing/test/video_processing_unittest.h b/modules/video_processing/test/video_processing_unittest.h
index 6edd72e..92e9138 100644
--- a/modules/video_processing/test/video_processing_unittest.h
+++ b/modules/video_processing/test/video_processing_unittest.h
@@ -13,7 +13,7 @@
#include <string>
-#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/sdk/objc/Framework/Classes/avfoundationvideocapturer.mm b/sdk/objc/Framework/Classes/avfoundationvideocapturer.mm
index 5708346..115f7f8 100644
--- a/sdk/objc/Framework/Classes/avfoundationvideocapturer.mm
+++ b/sdk/objc/Framework/Classes/avfoundationvideocapturer.mm
@@ -304,7 +304,8 @@
- (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 @@
- (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/system_wrappers/source/aligned_array_unittest.cc b/system_wrappers/source/aligned_array_unittest.cc
index 01238f8..5f3cdf7 100644
--- a/system_wrappers/source/aligned_array_unittest.cc
+++ b/system_wrappers/source/aligned_array_unittest.cc
@@ -12,7 +12,7 @@
#include <stdint.h>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
namespace {
diff --git a/system_wrappers/source/aligned_malloc.cc b/system_wrappers/source/aligned_malloc.cc
index a654e97..f700f8b 100644
--- a/system_wrappers/source/aligned_malloc.cc
+++ b/system_wrappers/source/aligned_malloc.cc
@@ -13,7 +13,7 @@
#include <memory.h>
#include <stdlib.h>
-#if _WIN32
+#ifdef _WIN32
#include <windows.h>
#else
#include <stdint.h>
diff --git a/system_wrappers/source/aligned_malloc_unittest.cc b/system_wrappers/source/aligned_malloc_unittest.cc
index ed6cd42..fbd5d6e 100644
--- a/system_wrappers/source/aligned_malloc_unittest.cc
+++ b/system_wrappers/source/aligned_malloc_unittest.cc
@@ -12,13 +12,13 @@
#include <memory>
-#if _WIN32
+#ifdef _WIN32
#include <windows.h>
#else
#include <stdint.h>
#endif
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/system_wrappers/source/clock_unittest.cc b/system_wrappers/source/clock_unittest.cc
index 9cb8ec7..76507ce 100644
--- a/system_wrappers/source/clock_unittest.cc
+++ b/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/system_wrappers/source/condition_variable_unittest.cc b/system_wrappers/source/condition_variable_unittest.cc
index 5fc6bc6..ac61b5c 100644
--- a/system_wrappers/source/condition_variable_unittest.cc
+++ b/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/system_wrappers/source/critical_section_unittest.cc b/system_wrappers/source/critical_section_unittest.cc
index 9abf8b8..0e9f8c8 100644
--- a/system_wrappers/source/critical_section_unittest.cc
+++ b/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/system_wrappers/source/data_log_helpers_unittest.cc b/system_wrappers/source/data_log_helpers_unittest.cc
index 25e1827..1cf7187 100644
--- a/system_wrappers/source/data_log_helpers_unittest.cc
+++ b/system_wrappers/source/data_log_helpers_unittest.cc
@@ -12,7 +12,7 @@
#include <string>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
using ::webrtc::DataLog;
diff --git a/system_wrappers/source/data_log_unittest.cc b/system_wrappers/source/data_log_unittest.cc
index 53f201c..8fb01bc 100644
--- a/system_wrappers/source/data_log_unittest.cc
+++ b/system_wrappers/source/data_log_unittest.cc
@@ -13,7 +13,7 @@
#include <map>
#include <string>
-#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/system_wrappers/source/data_log_unittest_disabled.cc b/system_wrappers/source/data_log_unittest_disabled.cc
index 1855a3e..c06648e 100644
--- a/system_wrappers/source/data_log_unittest_disabled.cc
+++ b/system_wrappers/source/data_log_unittest_disabled.cc
@@ -12,7 +12,7 @@
#include <stdio.h>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
using ::webrtc::DataLog;
diff --git a/system_wrappers/source/event_timer_posix_unittest.cc b/system_wrappers/source/event_timer_posix_unittest.cc
index 4f4514d..47ef47e 100644
--- a/system_wrappers/source/event_timer_posix_unittest.cc
+++ b/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/system_wrappers/source/logging_unittest.cc b/system_wrappers/source/logging_unittest.cc
index 118c342..b7318da 100644
--- a/system_wrappers/source/logging_unittest.cc
+++ b/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/system_wrappers/source/metrics_default_unittest.cc b/system_wrappers/source/metrics_default_unittest.cc
index c130a8c..4ffb4c2 100644
--- a/system_wrappers/source/metrics_default_unittest.cc
+++ b/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/system_wrappers/source/metrics_unittest.cc b/system_wrappers/source/metrics_unittest.cc
index 1d7888f..5494224 100644
--- a/system_wrappers/source/metrics_unittest.cc
+++ b/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/system_wrappers/source/ntp_time_unittest.cc b/system_wrappers/source/ntp_time_unittest.cc
index ff11288..50943ae 100644
--- a/system_wrappers/source/ntp_time_unittest.cc
+++ b/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/system_wrappers/source/rtp_to_ntp_unittest.cc b/system_wrappers/source/rtp_to_ntp_unittest.cc
index 78e4a52..0e81e4d8 100644
--- a/system_wrappers/source/rtp_to_ntp_unittest.cc
+++ b/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/system_wrappers/source/stl_util_unittest.cc b/system_wrappers/source/stl_util_unittest.cc
index ed5c1d9..d75e44a 100644
--- a/system_wrappers/source/stl_util_unittest.cc
+++ b/system_wrappers/source/stl_util_unittest.cc
@@ -13,7 +13,7 @@
#include <set>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
namespace {
diff --git a/system_wrappers/source/stringize_macros_unittest.cc b/system_wrappers/source/stringize_macros_unittest.cc
index c2f312b..8b103c5 100644
--- a/system_wrappers/source/stringize_macros_unittest.cc
+++ b/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/test/BUILD.gn b/test/BUILD.gn
index 249c78c..94cf7be 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -106,6 +106,8 @@
testonly = true
sources = [
+ "gmock.h",
+ "gtest.h",
"testsupport/fileutils.cc",
"testsupport/fileutils.h",
"testsupport/frame_reader.cc",
@@ -127,6 +129,7 @@
deps = [
"../base:gtest_prod",
+ "../base:rtc_base_approved",
"../common_video",
"../system_wrappers",
"//testing/gmock",
diff --git a/test/DEPS b/test/DEPS
index e8ed18b..969a10c 100644
--- a/test/DEPS
+++ b/test/DEPS
@@ -12,3 +12,12 @@
"+webrtc/system_wrappers",
"+webrtc/voice_engine",
]
+
+specific_include_rules = {
+ "gmock\.h": [
+ "+testing/gmock/include/gmock",
+ ],
+ "gtest\.h": [
+ "+testing/gtest/include/gtest",
+ ],
+}
diff --git a/test/configurable_frame_size_encoder.cc b/test/configurable_frame_size_encoder.cc
index 831e481..1453418 100644
--- a/test/configurable_frame_size_encoder.cc
+++ b/test/configurable_frame_size_encoder.cc
@@ -12,7 +12,7 @@
#include <string.h>
-#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/test/direct_transport.cc b/test/direct_transport.cc
index 591e154..28a67a4 100644
--- a/test/direct_transport.cc
+++ b/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/test/fake_audio_device.cc b/test/fake_audio_device.cc
index 43c2933..220755f 100644
--- a/test/fake_audio_device.cc
+++ b/test/fake_audio_device.cc
@@ -12,7 +12,7 @@
#include <algorithm>
-#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/test/fake_decoder.cc b/test/fake_decoder.cc
index ef8f887..103b41c 100644
--- a/test/fake_decoder.cc
+++ b/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/test/fake_encoder.cc b/test/fake_encoder.cc
index d015ab8..3a9ae4e 100644
--- a/test/fake_encoder.cc
+++ b/test/fake_encoder.cc
@@ -12,7 +12,7 @@
#include <algorithm>
-#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/test/fake_network_pipe_unittest.cc b/test/fake_network_pipe_unittest.cc
index fcc0c93..fa58bf5 100644
--- a/test/fake_network_pipe_unittest.cc
+++ b/test/fake_network_pipe_unittest.cc
@@ -10,8 +10,8 @@
#include <memory>
-#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/test/frame_generator_unittest.cc b/test/frame_generator_unittest.cc
index b375d04..4b90458 100644
--- a/test/frame_generator_unittest.cc
+++ b/test/frame_generator_unittest.cc
@@ -13,7 +13,7 @@
#include <memory>
#include <string>
-#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/test/gmock.h b/test/gmock.h
new file mode 100644
index 0000000..bc12fb9
--- /dev/null
+++ b/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/test/gtest.h b/test/gtest.h
new file mode 100644
index 0000000..2d222cc
--- /dev/null
+++ b/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/test/mock_transport.h b/test/mock_transport.h
index 4937134..37a72b3 100644
--- a/test/mock_transport.h
+++ b/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/test/mock_voe_channel_proxy.h b/test/mock_voe_channel_proxy.h
index 069b4f1..40fee1b 100644
--- a/test/mock_voe_channel_proxy.h
+++ b/test/mock_voe_channel_proxy.h
@@ -12,7 +12,7 @@
#define WEBRTC_TEST_MOCK_VOE_CHANNEL_PROXY_H_
#include <string>
-#include "testing/gmock/include/gmock/gmock.h"
+#include "webrtc/test/gmock.h"
#include "webrtc/voice_engine/channel_proxy.h"
namespace webrtc {
diff --git a/test/mock_voice_engine.h b/test/mock_voice_engine.h
index 4118977..85d27bd 100644
--- a/test/mock_voice_engine.h
+++ b/test/mock_voice_engine.h
@@ -13,7 +13,7 @@
#include <memory>
-#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/test/rtp_file_reader_unittest.cc b/test/rtp_file_reader_unittest.cc
index fceac38..0a0d676 100644
--- a/test/rtp_file_reader_unittest.cc
+++ b/test/rtp_file_reader_unittest.cc
@@ -11,7 +11,7 @@
#include <map>
#include <memory>
-#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/test/rtp_file_writer_unittest.cc b/test/rtp_file_writer_unittest.cc
index 3287f97..fa7d79d 100644
--- a/test/rtp_file_writer_unittest.cc
+++ b/test/rtp_file_writer_unittest.cc
@@ -12,7 +12,7 @@
#include <memory>
-#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/test/rtp_rtcp_observer.h b/test/rtp_rtcp_observer.h
index ab86561..72bcdda 100644
--- a/test/rtp_rtcp_observer.h
+++ b/test/rtp_rtcp_observer.h
@@ -14,7 +14,7 @@
#include <memory>
#include <vector>
-#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/test/test.gyp b/test/test.gyp
index ae36da8..1d476a9 100644
--- a/test/test.gyp
+++ b/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/test/test_main.cc b/test/test_main.cc
index a92ad9f..df7a82f 100644
--- a/test/test_main.cc
+++ b/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/test/test_suite.cc b/test/test_suite.cc
index 69e4a57..174de02 100644
--- a/test/test_suite.cc
+++ b/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/test/testsupport/always_passing_unittest.cc b/test/testsupport/always_passing_unittest.cc
index afb80e6..79a4869 100644
--- a/test/testsupport/always_passing_unittest.cc
+++ b/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/test/testsupport/fileutils_unittest.cc b/test/testsupport/fileutils_unittest.cc
index e205db3..2677b8c 100644
--- a/test/testsupport/fileutils_unittest.cc
+++ b/test/testsupport/fileutils_unittest.cc
@@ -15,7 +15,7 @@
#include <list>
#include <string>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
#ifdef WIN32
#define chdir _chdir
diff --git a/test/testsupport/frame_reader_unittest.cc b/test/testsupport/frame_reader_unittest.cc
index 25ea913..8b16926 100644
--- a/test/testsupport/frame_reader_unittest.cc
+++ b/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/test/testsupport/frame_writer_unittest.cc b/test/testsupport/frame_writer_unittest.cc
index da1e268..59173bd 100644
--- a/test/testsupport/frame_writer_unittest.cc
+++ b/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/test/testsupport/metrics/video_metrics_unittest.cc b/test/testsupport/metrics/video_metrics_unittest.cc
index 0958dcf..83a34a3 100644
--- a/test/testsupport/metrics/video_metrics_unittest.cc
+++ b/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/test/testsupport/mock/mock_frame_reader.h b/test/testsupport/mock/mock_frame_reader.h
index f06750e..8d1c669 100644
--- a/test/testsupport/mock/mock_frame_reader.h
+++ b/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/test/testsupport/mock/mock_frame_writer.h b/test/testsupport/mock/mock_frame_writer.h
index 10f58fb..8ba96bc 100644
--- a/test/testsupport/mock/mock_frame_writer.h
+++ b/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/test/testsupport/packet_reader_unittest.cc b/test/testsupport/packet_reader_unittest.cc
index 2679be4..ded1db3 100644
--- a/test/testsupport/packet_reader_unittest.cc
+++ b/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/test/testsupport/perf_test_unittest.cc b/test/testsupport/perf_test_unittest.cc
index f7e50e1..4516b99 100644
--- a/test/testsupport/perf_test_unittest.cc
+++ b/test/testsupport/perf_test_unittest.cc
@@ -12,7 +12,7 @@
#include <string>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
namespace webrtc {
namespace test {
diff --git a/tools/agc/activity_metric.cc b/tools/agc/activity_metric.cc
index c3b46ca..7eac140 100644
--- a/tools/agc/activity_metric.cc
+++ b/tools/agc/activity_metric.cc
@@ -17,7 +17,7 @@
#include <memory>
#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/tools/event_log_visualizer/plot_protobuf.h b/tools/event_log_visualizer/plot_protobuf.h
index 2008a22..f80ff49 100644
--- a/tools/event_log_visualizer/plot_protobuf.h
+++ b/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/tools/frame_analyzer/video_quality_analysis_unittest.cc b/tools/frame_analyzer/video_quality_analysis_unittest.cc
index 85fd118..f8a4b69 100644
--- a/tools/frame_analyzer/video_quality_analysis_unittest.cc
+++ b/tools/frame_analyzer/video_quality_analysis_unittest.cc
@@ -14,7 +14,7 @@
#include <fstream>
#include <string>
-#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/tools/frame_editing/frame_editing_unittest.cc b/tools/frame_editing/frame_editing_unittest.cc
index e1ba1de..c068296 100644
--- a/tools/frame_editing/frame_editing_unittest.cc
+++ b/tools/frame_editing/frame_editing_unittest.cc
@@ -14,7 +14,7 @@
#include <fstream>
#include <memory>
-#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/tools/simple_command_line_parser_unittest.cc b/tools/simple_command_line_parser_unittest.cc
index 48640df..739ce83 100644
--- a/tools/simple_command_line_parser_unittest.cc
+++ b/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/video/call_stats_unittest.cc b/video/call_stats_unittest.cc
index f81a3a3..7f98c91 100644
--- a/video/call_stats_unittest.cc
+++ b/video/call_stats_unittest.cc
@@ -10,8 +10,8 @@
#include <memory>
-#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/video/encoder_state_feedback_unittest.cc b/video/encoder_state_feedback_unittest.cc
index cf92813..fb9cf0c 100644
--- a/video/encoder_state_feedback_unittest.cc
+++ b/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/video/end_to_end_tests.cc b/video/end_to_end_tests.cc
index 021ec3a..0bd1ec2 100644
--- a/video/end_to_end_tests.cc
+++ b/video/end_to_end_tests.cc
@@ -15,7 +15,7 @@
#include <string>
#include <vector>
-#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/video/full_stack.cc b/video/full_stack.cc
index 26aae3c..c7d1bec 100644
--- a/video/full_stack.cc
+++ b/video/full_stack.cc
@@ -9,7 +9,7 @@
*/
#include <stdio.h>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/video/video_quality_test.h"
namespace webrtc {
diff --git a/video/overuse_frame_detector_unittest.cc b/video/overuse_frame_detector_unittest.cc
index d6700e2..7f69ac0 100644
--- a/video/overuse_frame_detector_unittest.cc
+++ b/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/video/payload_router_unittest.cc b/video/payload_router_unittest.cc
index b5255d3..ed8af9f 100644
--- a/video/payload_router_unittest.cc
+++ b/video/payload_router_unittest.cc
@@ -10,8 +10,8 @@
#include <memory>
-#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/video/replay.cc b/video/replay.cc
index eb73440..90bfc33 100644
--- a/video/replay.cc
+++ b/video/replay.cc
@@ -15,7 +15,7 @@
#include <sstream>
#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/video/report_block_stats_unittest.cc b/video/report_block_stats_unittest.cc
index 5cde900..557f1f2 100644
--- a/video/report_block_stats_unittest.cc
+++ b/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/video/screenshare_loopback.cc b/video/screenshare_loopback.cc
index 2d1e1d3..b2e68be 100644
--- a/video/screenshare_loopback.cc
+++ b/video/screenshare_loopback.cc
@@ -11,7 +11,7 @@
#include <stdio.h>
#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/video/send_delay_stats_unittest.cc b/video/send_delay_stats_unittest.cc
index 24d056c..811d63b 100644
--- a/video/send_delay_stats_unittest.cc
+++ b/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/video/send_statistics_proxy_unittest.cc b/video/send_statistics_proxy_unittest.cc
index 593c93b..4676651 100644
--- a/video/send_statistics_proxy_unittest.cc
+++ b/video/send_statistics_proxy_unittest.cc
@@ -15,7 +15,7 @@
#include <string>
#include <vector>
-#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/video/stats_counter_unittest.cc b/video/stats_counter_unittest.cc
index 740e99e..b906532 100644
--- a/video/stats_counter_unittest.cc
+++ b/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/video/stream_synchronization_unittest.cc b/video/stream_synchronization_unittest.cc
index 2834dfe..f09bee4 100644
--- a/video/stream_synchronization_unittest.cc
+++ b/video/stream_synchronization_unittest.cc
@@ -12,7 +12,7 @@
#include <algorithm>
-#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/gtest.h"
#include "webrtc/video/stream_synchronization.h"
namespace webrtc {
diff --git a/video/video_decoder_unittest.cc b/video/video_decoder_unittest.cc
index b95aa20..07bce41 100644
--- a/video/video_decoder_unittest.cc
+++ b/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/video/video_encoder_unittest.cc b/video/video_encoder_unittest.cc
index eb2b450..e1cfd23 100644
--- a/video/video_encoder_unittest.cc
+++ b/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/video/video_loopback.cc b/video/video_loopback.cc
index da73640..9b4f784 100644
--- a/video/video_loopback.cc
+++ b/video/video_loopback.cc
@@ -11,7 +11,7 @@
#include <stdio.h>
#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/video/video_quality_test.cc b/video/video_quality_test.cc
index ea0e0d9..6186aaf 100644
--- a/video/video_quality_test.cc
+++ b/video/video_quality_test.cc
@@ -17,7 +17,7 @@
#include <string>
#include <vector>
-#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/video/video_send_stream_tests.cc b/video/video_send_stream_tests.cc
index a36be32..656aadc 100644
--- a/video/video_send_stream_tests.cc
+++ b/video/video_send_stream_tests.cc
@@ -11,7 +11,7 @@
#include <memory>
#include <vector>
-#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/video/vie_encoder_unittest.cc b/video/vie_encoder_unittest.cc
index 1ab6e68..00e6cef 100644
--- a/video/vie_encoder_unittest.cc
+++ b/video/vie_encoder_unittest.cc
@@ -10,7 +10,7 @@
#include <utility>
-#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/video/vie_remb_unittest.cc b/video/vie_remb_unittest.cc
index 2c33401..f3f4edd 100644
--- a/video/vie_remb_unittest.cc
+++ b/video/vie_remb_unittest.cc
@@ -11,8 +11,8 @@
#include <memory>
#include <vector>
-#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/voice_engine/channel_unittest.cc b/voice_engine/channel_unittest.cc
index a6b1ea6..e040b77 100644
--- a/voice_engine/channel_unittest.cc
+++ b/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/voice_engine/mock/mock_voe_observer.h b/voice_engine/mock/mock_voe_observer.h
index 1e8cbaa..9abc2eb 100644
--- a/voice_engine/mock/mock_voe_observer.h
+++ b/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/voice_engine/network_predictor_unittest.cc b/voice_engine/network_predictor_unittest.cc
index 1471f46..22f9d3a 100644
--- a/voice_engine/network_predictor_unittest.cc
+++ b/voice_engine/network_predictor_unittest.cc
@@ -12,7 +12,7 @@
#include <memory>
-#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/voice_engine/test/auto_test/automated_mode.cc b/voice_engine/test/auto_test/automated_mode.cc
index aa59e91..67a73ee 100644
--- a/voice_engine/test/auto_test/automated_mode.cc
+++ b/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/voice_engine/test/auto_test/fakes/conference_transport.h b/voice_engine/test/auto_test/fakes/conference_transport.h
index bbdf501..c0f563a 100644
--- a/voice_engine/test/auto_test/fakes/conference_transport.h
+++ b/voice_engine/test/auto_test/fakes/conference_transport.h
@@ -16,7 +16,7 @@
#include <memory>
#include <utility>
-#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/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h b/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h
index 1b226ff..75f48b2 100644
--- a/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h
+++ b/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/voice_engine/test/auto_test/voe_conference_test.cc b/voice_engine/test/auto_test/voe_conference_test.cc
index 946eb4e..770df03 100644
--- a/voice_engine/test/auto_test/voe_conference_test.cc
+++ b/voice_engine/test/auto_test/voe_conference_test.cc
@@ -10,7 +10,7 @@
#include <queue>
-#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/voice_engine/test/auto_test/voe_output_test.cc b/voice_engine/test/auto_test/voe_output_test.cc
index 4044fba..a732a2e 100644
--- a/voice_engine/test/auto_test/voe_output_test.cc
+++ b/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/voice_engine/test/channel_transport/channel_transport.cc b/voice_engine/test/channel_transport/channel_transport.cc
index 785f65b..91c83d7 100644
--- a/voice_engine/test/channel_transport/channel_transport.cc
+++ b/voice_engine/test/channel_transport/channel_transport.cc
@@ -13,7 +13,7 @@
#include <stdio.h>
#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/voice_engine/test/channel_transport/udp_socket_manager_unittest.cc b/voice_engine/test/channel_transport/udp_socket_manager_unittest.cc
index 812fb23..7fce793 100644
--- a/voice_engine/test/channel_transport/udp_socket_manager_unittest.cc
+++ b/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/voice_engine/test/channel_transport/udp_socket_wrapper_unittest.cc b/voice_engine/test/channel_transport/udp_socket_wrapper_unittest.cc
index 4bbd849..befd611 100644
--- a/voice_engine/test/channel_transport/udp_socket_wrapper_unittest.cc
+++ b/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/voice_engine/test/channel_transport/udp_transport_unittest.cc b/voice_engine/test/channel_transport/udp_transport_unittest.cc
index f2f9d6b..559b8cc 100644
--- a/voice_engine/test/channel_transport/udp_transport_unittest.cc
+++ b/voice_engine/test/channel_transport/udp_transport_unittest.cc
@@ -10,8 +10,8 @@
#include <vector>
-#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/voice_engine/test/cmd_test/voe_cmd_test.cc b/voice_engine/test/cmd_test/voe_cmd_test.cc
index 0208c70..fbd5235 100644
--- a/voice_engine/test/cmd_test/voe_cmd_test.cc
+++ b/voice_engine/test/cmd_test/voe_cmd_test.cc
@@ -19,7 +19,7 @@
#include <vector>
#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/voice_engine/transmit_mixer_unittest.cc b/voice_engine/transmit_mixer_unittest.cc
index 27aa8b3..bd390ae 100644
--- a/voice_engine/transmit_mixer_unittest.cc
+++ b/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/voice_engine/utility_unittest.cc b/voice_engine/utility_unittest.cc
index 921c3e5..d529682 100644
--- a/voice_engine/utility_unittest.cc
+++ b/voice_engine/utility_unittest.cc
@@ -10,7 +10,7 @@
#include <math.h>
-#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/voice_engine/voe_audio_processing_unittest.cc b/voice_engine/voe_audio_processing_unittest.cc
index 0d725bc..ab4f3cc 100644
--- a/voice_engine/voe_audio_processing_unittest.cc
+++ b/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/voice_engine/voe_base_unittest.cc b/voice_engine/voe_base_unittest.cc
index e53dee2..f87d324 100644
--- a/voice_engine/voe_base_unittest.cc
+++ b/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/voice_engine/voe_codec_unittest.cc b/voice_engine/voe_codec_unittest.cc
index c056ba0..acef75a 100644
--- a/voice_engine/voe_codec_unittest.cc
+++ b/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/voice_engine/voe_network_unittest.cc b/voice_engine/voe_network_unittest.cc
index e5d8cc8..ef6e4fb 100644
--- a/voice_engine/voe_network_unittest.cc
+++ b/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/voice_engine/voice_engine_fixture.h b/voice_engine/voice_engine_fixture.h
index 2967678..0dabf28 100644
--- a/voice_engine/voice_engine_fixture.h
+++ b/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"
