commit a2f7798ec2fe29652bade4ba6b3f29c65328360e
author hjon <hjon@webrtc.org> Fri Mar 04 07:09:09 2016 -0800
committer Commit bot <commit-bot@chromium.org> Fri Mar 04 15:09:16 2016 +0000
tree 36b43b6f108c6dee1095848c67710d325c8d4d1b
parent 78417cf7c0e1ed41e2b65f72df147b3f5b01992f

Tweaks for new Objective-C API.

BUG=

Review URL: https://codereview.webrtc.org/1696673003

Cr-Commit-Position: refs/heads/master@{#11872}

webrtc/api/objctests/RTCIceServerTest.mm

diff --git a/webrtc/api/objctests/RTCIceServerTest.mm b/webrtc/api/objctests/RTCIceServerTest.mm
index 2e6fb25..5116ba0 100644
--- a/webrtc/api/objctests/RTCIceServerTest.mm
+++ b/webrtc/api/objctests/RTCIceServerTest.mm
@@ -31,7 +31,7 @@
   RTCIceServer *server = [[RTCIceServer alloc] initWithURLStrings:@[
       @"stun:stun1.example.net" ]];
 
-  webrtc::PeerConnectionInterface::IceServer iceStruct = server.iceServer;
+  webrtc::PeerConnectionInterface::IceServer iceStruct = server.nativeServer;
   EXPECT_EQ(1u, iceStruct.urls.size());
   EXPECT_EQ("stun:stun1.example.net", iceStruct.urls.front());
   EXPECT_EQ("", iceStruct.username);
@@ -42,7 +42,7 @@
   RTCIceServer *server = [[RTCIceServer alloc] initWithURLStrings:@[
       @"turn1:turn1.example.net", @"turn2:turn2.example.net" ]];
 
-  webrtc::PeerConnectionInterface::IceServer iceStruct = server.iceServer;
+  webrtc::PeerConnectionInterface::IceServer iceStruct = server.nativeServer;
   EXPECT_EQ(2u, iceStruct.urls.size());
   EXPECT_EQ("turn1:turn1.example.net", iceStruct.urls.front());
   EXPECT_EQ("turn2:turn2.example.net", iceStruct.urls.back());
@@ -55,7 +55,7 @@
       initWithURLStrings:@[ @"turn1:turn1.example.net" ]
                 username:@"username"
               credential:@"credential"];
-  webrtc::PeerConnectionInterface::IceServer iceStruct = server.iceServer;
+  webrtc::PeerConnectionInterface::IceServer iceStruct = server.nativeServer;
   EXPECT_EQ(1u, iceStruct.urls.size());
   EXPECT_EQ("turn1:turn1.example.net", iceStruct.urls.front());
   EXPECT_EQ("username", iceStruct.username);

webrtc/api/objctests/RTCSessionDescriptionTest.mm

diff --git a/webrtc/api/objctests/RTCSessionDescriptionTest.mm b/webrtc/api/objctests/RTCSessionDescriptionTest.mm
index 2404ded..605c5f1 100644
--- a/webrtc/api/objctests/RTCSessionDescriptionTest.mm
+++ b/webrtc/api/objctests/RTCSessionDescriptionTest.mm
@@ -36,7 +36,7 @@
       description.nativeDescription;
 
   EXPECT_EQ(RTCSdpTypeAnswer,
-      [RTCSessionDescription typeForString:nativeDescription->type()]);
+      [RTCSessionDescription typeForStdString:nativeDescription->type()]);
 
   std::string sdp;
   nativeDescription->ToString(&sdp);
@@ -55,7 +55,7 @@
       [[RTCSessionDescription alloc] initWithNativeDescription:
       nativeDescription];
   EXPECT_EQ(webrtc::SessionDescriptionInterface::kAnswer,
-      [RTCSessionDescription stringForType:description.type]);
+      [RTCSessionDescription stdStringForType:description.type]);
   EXPECT_TRUE([[self sdp] isEqualToString:description.sdp]);
 }