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/objc/RTCDataChannel.mm

diff --git a/webrtc/api/objc/RTCDataChannel.mm b/webrtc/api/objc/RTCDataChannel.mm
index a1f484a..5778cb5 100644
--- a/webrtc/api/objc/RTCDataChannel.mm
+++ b/webrtc/api/objc/RTCDataChannel.mm
@@ -123,7 +123,7 @@
   return _nativDataChannel->negotiated();
 }
 
-- (int)id {
+- (int)channelId {
   return _nativDataChannel->id();
 }
 
@@ -161,7 +161,7 @@
 
 - (NSString *)description {
   return [NSString stringWithFormat:@"RTCDataChannel:\n%ld\n%@\n%@",
-                                    (long)self.id,
+                                    (long)self.channelId,
                                     self.label,
                                     [[self class]
                                         stringForState:self.readyState]];