base->rtc_base: Update .c, .mm and .java files.
TBR=kwiberg@webrtc.org
BUG=webrtc:7634
Review-Url: https://codereview.webrtc.org/2974613003
Cr-Commit-Position: refs/heads/master@{#18926}
diff --git a/webrtc/sdk/objc/Framework/Classes/Audio/RTCAudioSession.mm b/webrtc/sdk/objc/Framework/Classes/Audio/RTCAudioSession.mm
index bf27674..906f627 100644
--- a/webrtc/sdk/objc/Framework/Classes/Audio/RTCAudioSession.mm
+++ b/webrtc/sdk/objc/Framework/Classes/Audio/RTCAudioSession.mm
@@ -12,10 +12,9 @@
#import <UIKit/UIKit.h>
-#include "webrtc/base/atomicops.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/criticalsection.h"
-
+#include "webrtc/rtc_base/atomicops.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/criticalsection.h"
#import "WebRTC/RTCAudioSessionConfiguration.h"
#import "WebRTC/RTCLogging.h"
diff --git a/webrtc/sdk/objc/Framework/Classes/Common/RTCFileLogger.mm b/webrtc/sdk/objc/Framework/Classes/Common/RTCFileLogger.mm
index c1fbd74..75d0621 100644
--- a/webrtc/sdk/objc/Framework/Classes/Common/RTCFileLogger.mm
+++ b/webrtc/sdk/objc/Framework/Classes/Common/RTCFileLogger.mm
@@ -12,10 +12,10 @@
#include <memory>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/filerotatingstream.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/logsinks.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/filerotatingstream.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/logsinks.h"
NSString *const kDefaultLogDirName = @"webrtc_logs";
NSUInteger const kDefaultMaxFileSize = 10 * 1024 * 1024; // 10MB.
diff --git a/webrtc/sdk/objc/Framework/Classes/Common/RTCLogging.mm b/webrtc/sdk/objc/Framework/Classes/Common/RTCLogging.mm
index ef62d1f..7b8ca0a 100644
--- a/webrtc/sdk/objc/Framework/Classes/Common/RTCLogging.mm
+++ b/webrtc/sdk/objc/Framework/Classes/Common/RTCLogging.mm
@@ -10,7 +10,7 @@
#import "WebRTC/RTCLogging.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
rtc::LoggingSeverity RTCGetNativeLoggingSeverity(RTCLoggingSeverity severity) {
switch (severity) {
diff --git a/webrtc/sdk/objc/Framework/Classes/Common/helpers.mm b/webrtc/sdk/objc/Framework/Classes/Common/helpers.mm
index fef75a5..6b44c59 100644
--- a/webrtc/sdk/objc/Framework/Classes/Common/helpers.mm
+++ b/webrtc/sdk/objc/Framework/Classes/Common/helpers.mm
@@ -17,8 +17,8 @@
#include <memory>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
#include "webrtc/sdk/objc/Framework/Classes/Common/helpers.h"
namespace webrtc {
diff --git a/webrtc/sdk/objc/Framework/Classes/Metal/RTCMTLRenderer.mm b/webrtc/sdk/objc/Framework/Classes/Metal/RTCMTLRenderer.mm
index e498a5a..1c60ecc 100644
--- a/webrtc/sdk/objc/Framework/Classes/Metal/RTCMTLRenderer.mm
+++ b/webrtc/sdk/objc/Framework/Classes/Metal/RTCMTLRenderer.mm
@@ -17,7 +17,7 @@
#import "WebRTC/RTCVideoFrame.h"
#include "webrtc/api/video/video_rotation.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
// As defined in shaderSource.
static NSString *const vertexFunctionName = @"vertexPassthrough";
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCAudioSource.mm b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCAudioSource.mm
index 764445b..07b1cb5 100644
--- a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCAudioSource.mm
+++ b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCAudioSource.mm
@@ -10,7 +10,7 @@
#import "RTCAudioSource+Private.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
@implementation RTCAudioSource {
}
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCAudioTrack.mm b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCAudioTrack.mm
index 5fa2d46..d8a0d51 100644
--- a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCAudioTrack.mm
+++ b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCAudioTrack.mm
@@ -15,7 +15,7 @@
#import "RTCMediaStreamTrack+Private.h"
#import "RTCPeerConnectionFactory+Private.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
@implementation RTCAudioTrack
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCConfiguration.mm b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCConfiguration.mm
index 48f9e37..ad11b30 100644
--- a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCConfiguration.mm
+++ b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCConfiguration.mm
@@ -15,8 +15,8 @@
#import "RTCIceServer+Private.h"
#import "WebRTC/RTCLogging.h"
-#include "webrtc/base/rtccertificategenerator.h"
-#include "webrtc/base/sslidentity.h"
+#include "webrtc/rtc_base/rtccertificategenerator.h"
+#include "webrtc/rtc_base/sslidentity.h"
@implementation RTCConfiguration
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCLegacyStatsReport.mm b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCLegacyStatsReport.mm
index a55bb3e..82b43f8 100644
--- a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCLegacyStatsReport.mm
+++ b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCLegacyStatsReport.mm
@@ -13,7 +13,7 @@
#import "NSString+StdString.h"
#import "WebRTC/RTCLogging.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
@implementation RTCLegacyStatsReport
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCMediaSource.mm b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCMediaSource.mm
index 996563b..956da16 100644
--- a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCMediaSource.mm
+++ b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCMediaSource.mm
@@ -10,7 +10,7 @@
#import "RTCMediaSource+Private.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
@implementation RTCMediaSource {
RTCMediaSourceType _type;
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection+Stats.mm b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection+Stats.mm
index 2c4571e..8e56465 100644
--- a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection+Stats.mm
+++ b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection+Stats.mm
@@ -14,7 +14,7 @@
#import "RTCMediaStreamTrack+Private.h"
#import "RTCLegacyStatsReport+Private.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection.mm b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection.mm
index 311e0dd..346f0ba 100644
--- a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection.mm
+++ b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnection.mm
@@ -26,7 +26,7 @@
#include <memory>
#include "webrtc/api/jsepicecandidate.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
NSString * const kRTCPeerConnectionErrorDomain =
@"org.webrtc.RTCPeerConnection";
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCRtpCodecParameters.mm b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCRtpCodecParameters.mm
index 1fd0f8f..3e137b8 100644
--- a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCRtpCodecParameters.mm
+++ b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCRtpCodecParameters.mm
@@ -13,8 +13,8 @@
#import "NSString+StdString.h"
#import "WebRTC/RTCMediaStreamTrack.h" // For "kind" strings.
-#include "webrtc/base/checks.h"
#include "webrtc/media/base/mediaconstants.h"
+#include "webrtc/rtc_base/checks.h"
const NSString * const kRTCRtxCodecName = @(cricket::kRtxCodecName);
const NSString * const kRTCRedCodecName = @(cricket::kRedCodecName);
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCSSLAdapter.mm b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCSSLAdapter.mm
index a0da105..4a14670 100644
--- a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCSSLAdapter.mm
+++ b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCSSLAdapter.mm
@@ -10,8 +10,8 @@
#import "WebRTC/RTCSSLAdapter.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/ssladapter.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/ssladapter.h"
BOOL RTCInitializeSSL() {
BOOL initialized = rtc::InitializeSSL();
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCSessionDescription.mm b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCSessionDescription.mm
index 417ff7d..66a1186 100644
--- a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCSessionDescription.mm
+++ b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCSessionDescription.mm
@@ -13,7 +13,7 @@
#import "NSString+StdString.h"
#import "WebRTC/RTCLogging.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
@implementation RTCSessionDescription
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCTracing.mm b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCTracing.mm
index 37755a6..f742e47 100644
--- a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCTracing.mm
+++ b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCTracing.mm
@@ -10,7 +10,7 @@
#import "WebRTC/RTCTracing.h"
-#include "webrtc/base/event_tracer.h"
+#include "webrtc/rtc_base/event_tracer.h"
void RTCSetupInternalTracer() {
rtc::tracing::SetupInternalTracer();
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoSource.mm b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoSource.mm
index cdc77b3..341a522 100644
--- a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoSource.mm
+++ b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoSource.mm
@@ -11,7 +11,7 @@
#import "RTCVideoSource+Private.h"
#include "webrtc/api/videosourceproxy.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
#include "webrtc/sdk/objc/Framework/Classes/Video/objcvideotracksource.h"
static webrtc::ObjcVideoTrackSource *getObjcVideoSource(
diff --git a/webrtc/sdk/objc/Framework/Classes/Video/RTCCVPixelBuffer.mm b/webrtc/sdk/objc/Framework/Classes/Video/RTCCVPixelBuffer.mm
index a45c212..72c9a26 100644
--- a/webrtc/sdk/objc/Framework/Classes/Video/RTCCVPixelBuffer.mm
+++ b/webrtc/sdk/objc/Framework/Classes/Video/RTCCVPixelBuffer.mm
@@ -10,9 +10,9 @@
#import "WebRTC/RTCVideoFrameBuffer.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
@implementation RTCCVPixelBuffer {
int _width;
diff --git a/webrtc/sdk/objc/Framework/Classes/Video/RTCDefaultShader.mm b/webrtc/sdk/objc/Framework/Classes/Video/RTCDefaultShader.mm
index 28df4bd..900f284 100644
--- a/webrtc/sdk/objc/Framework/Classes/Video/RTCDefaultShader.mm
+++ b/webrtc/sdk/objc/Framework/Classes/Video/RTCDefaultShader.mm
@@ -20,7 +20,7 @@
#import "RTCShader.h"
#import "WebRTC/RTCLogging.h"
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/optional.h"
static const int kYTextureUnit = 0;
static const int kUTextureUnit = 1;
diff --git a/webrtc/sdk/objc/Framework/Classes/Video/RTCShader.mm b/webrtc/sdk/objc/Framework/Classes/Video/RTCShader.mm
index 3c3e6ab..351f241 100644
--- a/webrtc/sdk/objc/Framework/Classes/Video/RTCShader.mm
+++ b/webrtc/sdk/objc/Framework/Classes/Video/RTCShader.mm
@@ -22,8 +22,8 @@
#import "RTCOpenGLDefines.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
// Vertex shader doesn't do anything except pass coordinates through.
const char kRTCVertexShaderSource[] =
diff --git a/webrtc/sdk/objc/Framework/Classes/Video/avfoundationvideocapturer.mm b/webrtc/sdk/objc/Framework/Classes/Video/avfoundationvideocapturer.mm
index c2e2056..1c8403e 100644
--- a/webrtc/sdk/objc/Framework/Classes/Video/avfoundationvideocapturer.mm
+++ b/webrtc/sdk/objc/Framework/Classes/Video/avfoundationvideocapturer.mm
@@ -20,10 +20,10 @@
#include "avfoundationformatmapper.h"
#include "webrtc/api/video/video_rotation.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/thread.h"
#include "webrtc/sdk/objc/Framework/Classes/Video/objc_frame_buffer.h"
namespace webrtc {
diff --git a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/decoder.mm b/webrtc/sdk/objc/Framework/Classes/VideoToolbox/decoder.mm
index c039442..a8da809 100644
--- a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/decoder.mm
+++ b/webrtc/sdk/objc/Framework/Classes/VideoToolbox/decoder.mm
@@ -15,9 +15,9 @@
#include "libyuv/convert.h"
#include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
#include "webrtc/common_video/include/video_frame.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
#include "webrtc/sdk/objc/Framework/Classes/Video/objc_frame_buffer.h"
#include "webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h"
diff --git a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/encoder.mm b/webrtc/sdk/objc/Framework/Classes/VideoToolbox/encoder.mm
index 2bd485f..d3f5ef9 100644
--- a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/encoder.mm
+++ b/webrtc/sdk/objc/Framework/Classes/VideoToolbox/encoder.mm
@@ -21,9 +21,9 @@
#endif
#import "WebRTC/RTCVideoFrameBuffer.h"
#include "libyuv/convert_from.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
#include "webrtc/common_video/h264/profile_level_id.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
#include "webrtc/sdk/objc/Framework/Classes/Video/objc_frame_buffer.h"
#include "webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h"
#include "webrtc/system_wrappers/include/clock.h"
diff --git a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/videocodecfactory.mm b/webrtc/sdk/objc/Framework/Classes/VideoToolbox/videocodecfactory.mm
index 1aa5ba3..880047a 100644
--- a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/videocodecfactory.mm
+++ b/webrtc/sdk/objc/Framework/Classes/VideoToolbox/videocodecfactory.mm
@@ -9,9 +9,9 @@
*/
#include "webrtc/sdk/objc/Framework/Classes/VideoToolbox/videocodecfactory.h"
-#include "webrtc/base/logging.h"
#include "webrtc/common_video/h264/profile_level_id.h"
#include "webrtc/media/base/codec.h"
+#include "webrtc/rtc_base/logging.h"
#include "webrtc/sdk/objc/Framework/Classes/VideoToolbox/decoder.h"
#include "webrtc/sdk/objc/Framework/Classes/VideoToolbox/encoder.h"
#include "webrtc/system_wrappers/include/field_trial.h"
diff --git a/webrtc/sdk/objc/Framework/UnitTests/RTCAudioSessionTest.mm b/webrtc/sdk/objc/Framework/UnitTests/RTCAudioSessionTest.mm
index f932457..41618c3 100644
--- a/webrtc/sdk/objc/Framework/UnitTests/RTCAudioSessionTest.mm
+++ b/webrtc/sdk/objc/Framework/UnitTests/RTCAudioSessionTest.mm
@@ -11,7 +11,7 @@
#import <Foundation/Foundation.h>
#import <OCMock/OCMock.h>
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/gunit.h"
#import "RTCAudioSession+Private.h"
diff --git a/webrtc/sdk/objc/Framework/UnitTests/RTCCameraVideoCapturerTests.mm b/webrtc/sdk/objc/Framework/UnitTests/RTCCameraVideoCapturerTests.mm
index 76ff661..3c17176 100644
--- a/webrtc/sdk/objc/Framework/UnitTests/RTCCameraVideoCapturerTests.mm
+++ b/webrtc/sdk/objc/Framework/UnitTests/RTCCameraVideoCapturerTests.mm
@@ -14,7 +14,7 @@
#import <UIKit/UIKit.h>
#endif
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/gunit.h"
#import <WebRTC/RTCCameraVideoCapturer.h>
#import <WebRTC/RTCDispatcher.h>
diff --git a/webrtc/sdk/objc/Framework/UnitTests/RTCConfigurationTest.mm b/webrtc/sdk/objc/Framework/UnitTests/RTCConfigurationTest.mm
index cc6c493..df94d4f 100644
--- a/webrtc/sdk/objc/Framework/UnitTests/RTCConfigurationTest.mm
+++ b/webrtc/sdk/objc/Framework/UnitTests/RTCConfigurationTest.mm
@@ -12,7 +12,7 @@
#include <vector>
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/gunit.h"
#import "NSString+StdString.h"
#import "RTCConfiguration+Private.h"
diff --git a/webrtc/sdk/objc/Framework/UnitTests/RTCDataChannelConfigurationTest.mm b/webrtc/sdk/objc/Framework/UnitTests/RTCDataChannelConfigurationTest.mm
index 275898d..ec8ecaa 100644
--- a/webrtc/sdk/objc/Framework/UnitTests/RTCDataChannelConfigurationTest.mm
+++ b/webrtc/sdk/objc/Framework/UnitTests/RTCDataChannelConfigurationTest.mm
@@ -10,7 +10,7 @@
#import <Foundation/Foundation.h>
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/gunit.h"
#import "NSString+StdString.h"
#import "RTCDataChannelConfiguration+Private.h"
diff --git a/webrtc/sdk/objc/Framework/UnitTests/RTCIceCandidateTest.mm b/webrtc/sdk/objc/Framework/UnitTests/RTCIceCandidateTest.mm
index 20a9d73..9f0eb59 100644
--- a/webrtc/sdk/objc/Framework/UnitTests/RTCIceCandidateTest.mm
+++ b/webrtc/sdk/objc/Framework/UnitTests/RTCIceCandidateTest.mm
@@ -12,7 +12,7 @@
#include <memory>
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/gunit.h"
#import "NSString+StdString.h"
#import "RTCIceCandidate+Private.h"
diff --git a/webrtc/sdk/objc/Framework/UnitTests/RTCIceServerTest.mm b/webrtc/sdk/objc/Framework/UnitTests/RTCIceServerTest.mm
index bff7cb0..fb25eb3 100644
--- a/webrtc/sdk/objc/Framework/UnitTests/RTCIceServerTest.mm
+++ b/webrtc/sdk/objc/Framework/UnitTests/RTCIceServerTest.mm
@@ -12,7 +12,7 @@
#include <vector>
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/gunit.h"
#import "NSString+StdString.h"
#import "RTCIceServer+Private.h"
diff --git a/webrtc/sdk/objc/Framework/UnitTests/RTCMTLVideoViewTests.mm b/webrtc/sdk/objc/Framework/UnitTests/RTCMTLVideoViewTests.mm
index 63c59ff..a978498 100644
--- a/webrtc/sdk/objc/Framework/UnitTests/RTCMTLVideoViewTests.mm
+++ b/webrtc/sdk/objc/Framework/UnitTests/RTCMTLVideoViewTests.mm
@@ -11,7 +11,7 @@
#import <Foundation/Foundation.h>
#import <OCMock/OCMock.h>
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/gunit.h"
#include <Metal/RTCMTLNV12Renderer.h>
#include <WebRTC/RTCMTLVideoView.h>
diff --git a/webrtc/sdk/objc/Framework/UnitTests/RTCMediaConstraintsTest.mm b/webrtc/sdk/objc/Framework/UnitTests/RTCMediaConstraintsTest.mm
index 3413dfc..095e031 100644
--- a/webrtc/sdk/objc/Framework/UnitTests/RTCMediaConstraintsTest.mm
+++ b/webrtc/sdk/objc/Framework/UnitTests/RTCMediaConstraintsTest.mm
@@ -12,7 +12,7 @@
#include <memory>
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/gunit.h"
#import "NSString+StdString.h"
#import "RTCMediaConstraints+Private.h"
diff --git a/webrtc/sdk/objc/Framework/UnitTests/RTCPeerConnectionTest.mm b/webrtc/sdk/objc/Framework/UnitTests/RTCPeerConnectionTest.mm
index 1797fea..63b21bf 100644
--- a/webrtc/sdk/objc/Framework/UnitTests/RTCPeerConnectionTest.mm
+++ b/webrtc/sdk/objc/Framework/UnitTests/RTCPeerConnectionTest.mm
@@ -12,7 +12,7 @@
#include <vector>
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/gunit.h"
#import "NSString+StdString.h"
#import "RTCConfiguration+Private.h"
diff --git a/webrtc/sdk/objc/Framework/UnitTests/RTCSessionDescriptionTest.mm b/webrtc/sdk/objc/Framework/UnitTests/RTCSessionDescriptionTest.mm
index 90f4698..a6b9f8a 100644
--- a/webrtc/sdk/objc/Framework/UnitTests/RTCSessionDescriptionTest.mm
+++ b/webrtc/sdk/objc/Framework/UnitTests/RTCSessionDescriptionTest.mm
@@ -10,7 +10,7 @@
#import <Foundation/Foundation.h>
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/gunit.h"
#import "NSString+StdString.h"
#import "RTCSessionDescription+Private.h"
diff --git a/webrtc/sdk/objc/Framework/UnitTests/avformatmappertests.mm b/webrtc/sdk/objc/Framework/UnitTests/avformatmappertests.mm
index 4221a7c..eb0d951 100644
--- a/webrtc/sdk/objc/Framework/UnitTests/avformatmappertests.mm
+++ b/webrtc/sdk/objc/Framework/UnitTests/avformatmappertests.mm
@@ -11,7 +11,7 @@
#import <Foundation/Foundation.h>
#import <OCMock/OCMock.h>
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/gunit.h"
#include "Video/avfoundationformatmapper.h"