Fixing WebRTC after moving from src/webrtc to src/
In https://webrtc-review.googlesource.com/c/src/+/1560 we moved WebRTC
from src/webrtc to src/ (in order to preserve an healthy git history).
This CL takes care of fixing header guards, #include paths, etc...
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
TBR=tommi@webrtc.org
Bug: chromium:611808
Change-Id: Iea91618212bee0af16aa3f05071eab8f93706578
Reviewed-on: https://webrtc-review.googlesource.com/1561
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Henrik Kjellander <kjellander@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#19846}diff --git a/sdk/objc/Framework/UnitTests/RTCAudioSessionTest.mm b/sdk/objc/Framework/UnitTests/RTCAudioSessionTest.mm
index 41618c3..d94c635 100644
--- a/sdk/objc/Framework/UnitTests/RTCAudioSessionTest.mm
+++ b/sdk/objc/Framework/UnitTests/RTCAudioSessionTest.mm
@@ -11,7 +11,7 @@
#import <Foundation/Foundation.h>
#import <OCMock/OCMock.h>
-#include "webrtc/rtc_base/gunit.h"
+#include "rtc_base/gunit.h"
#import "RTCAudioSession+Private.h"
diff --git a/sdk/objc/Framework/UnitTests/RTCCameraVideoCapturerTests.mm b/sdk/objc/Framework/UnitTests/RTCCameraVideoCapturerTests.mm
index 66ac117..f543069 100644
--- a/sdk/objc/Framework/UnitTests/RTCCameraVideoCapturerTests.mm
+++ b/sdk/objc/Framework/UnitTests/RTCCameraVideoCapturerTests.mm
@@ -14,7 +14,7 @@
#import <UIKit/UIKit.h>
#endif
-#include "webrtc/rtc_base/gunit.h"
+#include "rtc_base/gunit.h"
#import <WebRTC/RTCCameraVideoCapturer.h>
#import <WebRTC/RTCDispatcher.h>
diff --git a/sdk/objc/Framework/UnitTests/RTCConfigurationTest.mm b/sdk/objc/Framework/UnitTests/RTCConfigurationTest.mm
index 4b44fb1..90de644 100644
--- a/sdk/objc/Framework/UnitTests/RTCConfigurationTest.mm
+++ b/sdk/objc/Framework/UnitTests/RTCConfigurationTest.mm
@@ -12,7 +12,7 @@
#include <vector>
-#include "webrtc/rtc_base/gunit.h"
+#include "rtc_base/gunit.h"
#import "NSString+StdString.h"
#import "RTCConfiguration+Private.h"
diff --git a/sdk/objc/Framework/UnitTests/RTCDataChannelConfigurationTest.mm b/sdk/objc/Framework/UnitTests/RTCDataChannelConfigurationTest.mm
index ec8ecaa..fa9f131 100644
--- a/sdk/objc/Framework/UnitTests/RTCDataChannelConfigurationTest.mm
+++ b/sdk/objc/Framework/UnitTests/RTCDataChannelConfigurationTest.mm
@@ -10,7 +10,7 @@
#import <Foundation/Foundation.h>
-#include "webrtc/rtc_base/gunit.h"
+#include "rtc_base/gunit.h"
#import "NSString+StdString.h"
#import "RTCDataChannelConfiguration+Private.h"
diff --git a/sdk/objc/Framework/UnitTests/RTCIceCandidateTest.mm b/sdk/objc/Framework/UnitTests/RTCIceCandidateTest.mm
index 9f0eb59..0c4c51c 100644
--- a/sdk/objc/Framework/UnitTests/RTCIceCandidateTest.mm
+++ b/sdk/objc/Framework/UnitTests/RTCIceCandidateTest.mm
@@ -12,7 +12,7 @@
#include <memory>
-#include "webrtc/rtc_base/gunit.h"
+#include "rtc_base/gunit.h"
#import "NSString+StdString.h"
#import "RTCIceCandidate+Private.h"
diff --git a/sdk/objc/Framework/UnitTests/RTCIceServerTest.mm b/sdk/objc/Framework/UnitTests/RTCIceServerTest.mm
index 669ede6..497aedb 100644
--- a/sdk/objc/Framework/UnitTests/RTCIceServerTest.mm
+++ b/sdk/objc/Framework/UnitTests/RTCIceServerTest.mm
@@ -12,7 +12,7 @@
#include <vector>
-#include "webrtc/rtc_base/gunit.h"
+#include "rtc_base/gunit.h"
#import "NSString+StdString.h"
#import "RTCIceServer+Private.h"
diff --git a/sdk/objc/Framework/UnitTests/RTCIntervalRangeTests.mm b/sdk/objc/Framework/UnitTests/RTCIntervalRangeTests.mm
index b995221..1c44b2d 100644
--- a/sdk/objc/Framework/UnitTests/RTCIntervalRangeTests.mm
+++ b/sdk/objc/Framework/UnitTests/RTCIntervalRangeTests.mm
@@ -10,7 +10,7 @@
#import <Foundation/Foundation.h>
-#include "webrtc/rtc_base/gunit.h"
+#include "rtc_base/gunit.h"
#import "RTCIntervalRange+Private.h"
#import "WebRTC/RTCIntervalRange.h"
diff --git a/sdk/objc/Framework/UnitTests/RTCMTLVideoViewTests.mm b/sdk/objc/Framework/UnitTests/RTCMTLVideoViewTests.mm
index a978498..eaaa71b 100644
--- a/sdk/objc/Framework/UnitTests/RTCMTLVideoViewTests.mm
+++ b/sdk/objc/Framework/UnitTests/RTCMTLVideoViewTests.mm
@@ -11,7 +11,7 @@
#import <Foundation/Foundation.h>
#import <OCMock/OCMock.h>
-#include "webrtc/rtc_base/gunit.h"
+#include "rtc_base/gunit.h"
#include <Metal/RTCMTLNV12Renderer.h>
#include <WebRTC/RTCMTLVideoView.h>
diff --git a/sdk/objc/Framework/UnitTests/RTCMediaConstraintsTest.mm b/sdk/objc/Framework/UnitTests/RTCMediaConstraintsTest.mm
index 095e031..5f9026c 100644
--- a/sdk/objc/Framework/UnitTests/RTCMediaConstraintsTest.mm
+++ b/sdk/objc/Framework/UnitTests/RTCMediaConstraintsTest.mm
@@ -12,7 +12,7 @@
#include <memory>
-#include "webrtc/rtc_base/gunit.h"
+#include "rtc_base/gunit.h"
#import "NSString+StdString.h"
#import "RTCMediaConstraints+Private.h"
diff --git a/sdk/objc/Framework/UnitTests/RTCPeerConnectionTest.mm b/sdk/objc/Framework/UnitTests/RTCPeerConnectionTest.mm
index bf3fc33..65bedde 100644
--- a/sdk/objc/Framework/UnitTests/RTCPeerConnectionTest.mm
+++ b/sdk/objc/Framework/UnitTests/RTCPeerConnectionTest.mm
@@ -12,7 +12,7 @@
#include <vector>
-#include "webrtc/rtc_base/gunit.h"
+#include "rtc_base/gunit.h"
#import "NSString+StdString.h"
#import "RTCConfiguration+Private.h"
diff --git a/sdk/objc/Framework/UnitTests/RTCSessionDescriptionTest.mm b/sdk/objc/Framework/UnitTests/RTCSessionDescriptionTest.mm
index a6b9f8a..4428153 100644
--- a/sdk/objc/Framework/UnitTests/RTCSessionDescriptionTest.mm
+++ b/sdk/objc/Framework/UnitTests/RTCSessionDescriptionTest.mm
@@ -10,7 +10,7 @@
#import <Foundation/Foundation.h>
-#include "webrtc/rtc_base/gunit.h"
+#include "rtc_base/gunit.h"
#import "NSString+StdString.h"
#import "RTCSessionDescription+Private.h"
diff --git a/sdk/objc/Framework/UnitTests/RTCTracingTest.mm b/sdk/objc/Framework/UnitTests/RTCTracingTest.mm
index 49cc812..e21ba99 100644
--- a/sdk/objc/Framework/UnitTests/RTCTracingTest.mm
+++ b/sdk/objc/Framework/UnitTests/RTCTracingTest.mm
@@ -12,7 +12,7 @@
#include <vector>
-#include "webrtc/rtc_base/gunit.h"
+#include "rtc_base/gunit.h"
#import "NSString+StdString.h"
#import "WebRTC/RTCTracing.h"
diff --git a/sdk/objc/Framework/UnitTests/avformatmappertests.mm b/sdk/objc/Framework/UnitTests/avformatmappertests.mm
index eb0d951..ba1935b 100644
--- a/sdk/objc/Framework/UnitTests/avformatmappertests.mm
+++ b/sdk/objc/Framework/UnitTests/avformatmappertests.mm
@@ -11,7 +11,7 @@
#import <Foundation/Foundation.h>
#import <OCMock/OCMock.h>
-#include "webrtc/rtc_base/gunit.h"
+#include "rtc_base/gunit.h"
#include "Video/avfoundationformatmapper.h"
diff --git a/sdk/objc/Framework/UnitTests/objc_video_decoder_factory_tests.mm b/sdk/objc/Framework/UnitTests/objc_video_decoder_factory_tests.mm
index 6fcc422..d98b12a 100644
--- a/sdk/objc/Framework/UnitTests/objc_video_decoder_factory_tests.mm
+++ b/sdk/objc/Framework/UnitTests/objc_video_decoder_factory_tests.mm
@@ -11,15 +11,15 @@
#import <Foundation/Foundation.h>
#import <OCMock/OCMock.h>
-#include "webrtc/sdk/objc/Framework/Classes/VideoToolbox/objc_video_decoder_factory.h"
+#include "sdk/objc/Framework/Classes/VideoToolbox/objc_video_decoder_factory.h"
#import "WebRTC/RTCVideoCodec.h"
#import "WebRTC/RTCVideoCodecFactory.h"
-#include "webrtc/media/base/codec.h"
-#include "webrtc/modules/include/module_common_types.h"
-#include "webrtc/modules/video_coding/include/video_codec_interface.h"
-#include "webrtc/modules/video_coding/include/video_error_codes.h"
-#include "webrtc/rtc_base/gunit.h"
+#include "media/base/codec.h"
+#include "modules/include/module_common_types.h"
+#include "modules/video_coding/include/video_codec_interface.h"
+#include "modules/video_coding/include/video_error_codes.h"
+#include "rtc_base/gunit.h"
id<RTCVideoDecoderFactory> CreateDecoderFactoryReturning(int return_code) {
id decoderMock = OCMProtocolMock(@protocol(RTCVideoDecoder));
diff --git a/sdk/objc/Framework/UnitTests/objc_video_encoder_factory_tests.mm b/sdk/objc/Framework/UnitTests/objc_video_encoder_factory_tests.mm
index ed29bc2..1a3588c 100644
--- a/sdk/objc/Framework/UnitTests/objc_video_encoder_factory_tests.mm
+++ b/sdk/objc/Framework/UnitTests/objc_video_encoder_factory_tests.mm
@@ -11,16 +11,16 @@
#import <Foundation/Foundation.h>
#import <OCMock/OCMock.h>
-#include "webrtc/sdk/objc/Framework/Classes/VideoToolbox/objc_video_encoder_factory.h"
+#include "sdk/objc/Framework/Classes/VideoToolbox/objc_video_encoder_factory.h"
#import "WebRTC/RTCVideoCodec.h"
#import "WebRTC/RTCVideoCodecFactory.h"
#import "WebRTC/RTCVideoFrameBuffer.h"
-#include "webrtc/modules/include/module_common_types.h"
-#include "webrtc/modules/video_coding/include/video_codec_interface.h"
-#include "webrtc/modules/video_coding/include/video_error_codes.h"
-#include "webrtc/rtc_base/gunit.h"
-#include "webrtc/sdk/objc/Framework/Classes/Video/objc_frame_buffer.h"
+#include "modules/include/module_common_types.h"
+#include "modules/video_coding/include/video_codec_interface.h"
+#include "modules/video_coding/include/video_error_codes.h"
+#include "rtc_base/gunit.h"
+#include "sdk/objc/Framework/Classes/Video/objc_frame_buffer.h"
id<RTCVideoEncoderFactory> CreateEncoderFactoryReturning(int return_code) {
id encoderMock = OCMProtocolMock(@protocol(RTCVideoEncoder));