Tweaks for new Objective-C API.

webrtc/api/objc/RTCDataChannel.mm

 /*
  *  Copyright 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 105 matching lines @@
 }
 
 - (NSString *)protocol {
   return [NSString stringForStdString:_nativDataChannel->protocol()];
 }
 
 - (BOOL)isNegotiated {
   return _nativDataChannel->negotiated();
 }
 
-- (int)id {
+- (int)channelId {
   return _nativDataChannel->id();
 }
 
 - (RTCDataChannelState)readyState {
   return [[self class] dataChannelStateForNativeState:
       _nativDataChannel->state()];
 }
 
 - (uint64_t)bufferedAmount {
   return _nativDataChannel->buffered_amount();
@@ skipping 17 matching lines @@
 - (void)close {
   _nativDataChannel->Close();
 }
 
 - (BOOL)sendData:(RTCDataBuffer *)data {
   return _nativDataChannel->Send(*data.nativeDataBuffer);
 }
 
 - (NSString *)description {
   return [NSString stringWithFormat:@"RTCDataChannel:\n%ld\n%@\n%@",
-                                    (long)self.id,
+                                    (long)self.channelId,
                                     self.label,
                                     [[self class]
                                         stringForState:self.readyState]];
 }
 
 #pragma mark - Private
 
 - (instancetype)initWithNativeDataChannel:
     (rtc::scoped_refptr<webrtc::DataChannelInterface>)nativeDataChannel {
   NSParameterAssert(nativeDataChannel);
@@ skipping 39 matching lines @@
     case RTCDataChannelStateOpen:
       return @"Open";
     case RTCDataChannelStateClosing:
       return @"Closing";
     case RTCDataChannelStateClosed:
       return @"Closed";
   }
 }
 
 @end