Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1073)

Unified Diff: webrtc/examples/objc/AppRTCDemo/tests/ARDAppClientTest.mm

Issue 1690313002: Update iOS AppRTCDemo to use the updated Objective-C API. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Update Mac demo and other changes after updating against master Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/examples/objc/AppRTCDemo/tests/ARDAppClientTest.mm
diff --git a/webrtc/examples/objc/AppRTCDemo/tests/ARDAppClientTest.mm b/webrtc/examples/objc/AppRTCDemo/tests/ARDAppClientTest.mm
index 2470e50c9ebd1bcaf4d30d3c60a5a49c6f11168c..297b0a01a1e4222e9d31a5fbc09657bf2c5c8dee 100644
--- a/webrtc/examples/objc/AppRTCDemo/tests/ARDAppClientTest.mm
+++ b/webrtc/examples/objc/AppRTCDemo/tests/ARDAppClientTest.mm
@@ -15,9 +15,9 @@
#import "ARDJoinResponse+Internal.h"
#import "ARDMessageResponse+Internal.h"
#import "ARDSDPUtils.h"
-#import "RTCMediaConstraints.h"
-#import "RTCPeerConnectionFactory.h"
-#import "RTCSessionDescription.h"
+#import "webrtc/api/objc/RTCMediaConstraints.h"
tkchin_webrtc 2016/03/08 19:51:22 ditto import order
hjon_webrtc 2016/03/10 03:32:43 Done.
+#import "webrtc/api/objc/RTCPeerConnectionFactory.h"
+#import "webrtc/api/objc/RTCSessionDescription.h"
#include "webrtc/base/gunit.h"
#include "webrtc/base/ssladapter.h"
@@ -188,11 +188,11 @@
[OCMockObject mockForProtocol:@protocol(ARDTURNClient)];
[[[mockTURNClient stub] andDo:^(NSInvocation *invocation) {
// Don't return anything in TURN response.
- __unsafe_unretained void (^completionHandler)(NSArray *turnServers,
+ __unsafe_unretained void (^completionHandler)(RTCIceServer *turnServer,
NSError *error);
[invocation getArgument:&completionHandler atIndex:2];
- completionHandler([NSArray array], nil);
- }] requestServersWithCompletionHandler:[OCMArg any]];
+ completionHandler(nil, nil);
+ }] requestServerWithCompletionHandler:[OCMArg any]];
return mockTURNClient;
}
@@ -301,7 +301,7 @@
NSString *expectedSdp = @("m=video 9 RTP/SAVPF 120 100 116 117 96\n"
"a=rtpmap:120 H264/90000\n");
RTCSessionDescription* desc =
- [[RTCSessionDescription alloc] initWithType:@"offer" sdp:sdp];
+ [[RTCSessionDescription alloc] initWithType:RTCSdpTypeOffer sdp:sdp];
RTCSessionDescription *h264Desc =
[ARDSDPUtils descriptionForDescription:desc
preferredVideoCodec:@"H264"];

Powered by Google App Engine
This is Rietveld 408576698