Restore type attributes and remove extraneous nullability annotations for Objective-C Mac build

webrtc/api/objc/RTCMediaStream.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.
  */
 
 #import "RTCMediaStream.h"
 
 #include <vector>
 
 #import "webrtc/api/objc/RTCAudioTrack+Private.h"
 #import "webrtc/api/objc/RTCMediaStream+Private.h"
 #import "webrtc/api/objc/RTCMediaStreamTrack+Private.h"
 #import "webrtc/api/objc/RTCPeerConnectionFactory+Private.h"
 #import "webrtc/api/objc/RTCVideoTrack+Private.h"
 #import "webrtc/base/objc/NSString+StdString.h"
 
-// TODO(hjon): Update nullability types. See http://crbug/webrtc/5592
-
 @implementation RTCMediaStream {
   NSMutableArray *_audioTracks;
   NSMutableArray *_videoTracks;
   rtc::scoped_refptr<webrtc::MediaStreamInterface> _nativeMediaStream;
 }
 
 - (instancetype)initWithFactory:(RTCPeerConnectionFactory *)factory
                        streamId:(NSString *)streamId {
   NSParameterAssert(factory);
   NSParameterAssert(streamId.length);
   std::string nativeId = [NSString stdStringForString:streamId];
   rtc::scoped_refptr<webrtc::MediaStreamInterface> stream =
       factory.nativeFactory->CreateLocalMediaStream(nativeId);
   return [self initWithNativeMediaStream:stream];
 }
 
-- (NSArray *)audioTracks {
-// - (NSArray<RTCAudioTrack *> *)audioTracks {
+- (NSArray<RTCAudioTrack *> *)audioTracks {
   return [_audioTracks copy];
 }
 
-- (NSArray *)videoTracks {
-// - (NSArray<RTCVideoTrack *> *)videoTracks {
+- (NSArray<RTCVideoTrack *> *)videoTracks {
   return [_videoTracks copy];
 }
 
 - (NSString *)streamId {
   return [NSString stringForStdString:_nativeMediaStream->label()];
 }
 
 - (void)addAudioTrack:(RTCAudioTrack *)audioTrack {
   if (_nativeMediaStream->AddTrack(audioTrack.nativeAudioTrack)) {
     [_audioTracks addObject:audioTrack];
@@ skipping 61 matching lines @@
       RTCMediaStreamTrackType type = RTCMediaStreamTrackTypeVideo;
       RTCVideoTrack *videoTrack =
           [[RTCVideoTrack alloc] initWithNativeTrack:track type:type];
       [_videoTracks addObject:videoTrack];
     }
   }
   return self;
 }
 
 @end