| Index: webrtc/api/objc/RTCMediaStream.mm
 | 
| diff --git a/webrtc/api/objc/RTCMediaStream.mm b/webrtc/api/objc/RTCMediaStream.mm
 | 
| deleted file mode 100644
 | 
| index 666022301a11ec65ffc4232ddaf55fea1f7e076a..0000000000000000000000000000000000000000
 | 
| --- a/webrtc/api/objc/RTCMediaStream.mm
 | 
| +++ /dev/null
 | 
| @@ -1,123 +0,0 @@
 | 
| -/*
 | 
| - *  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"
 | 
| -
 | 
| -@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<RTCAudioTrack *> *)audioTracks {
 | 
| -  return [_audioTracks copy];
 | 
| -}
 | 
| -
 | 
| -- (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];
 | 
| -  }
 | 
| -}
 | 
| -
 | 
| -- (void)addVideoTrack:(RTCVideoTrack *)videoTrack {
 | 
| -  if (_nativeMediaStream->AddTrack(videoTrack.nativeVideoTrack)) {
 | 
| -    [_videoTracks addObject:videoTrack];
 | 
| -  }
 | 
| -}
 | 
| -
 | 
| -- (void)removeAudioTrack:(RTCAudioTrack *)audioTrack {
 | 
| -  NSUInteger index = [_audioTracks indexOfObjectIdenticalTo:audioTrack];
 | 
| -  NSAssert(index != NSNotFound,
 | 
| -           @"|removeAudioTrack| called on unexpected RTCAudioTrack");
 | 
| -  if (index != NSNotFound &&
 | 
| -      _nativeMediaStream->RemoveTrack(audioTrack.nativeAudioTrack)) {
 | 
| -    [_audioTracks removeObjectAtIndex:index];
 | 
| -  }
 | 
| -}
 | 
| -
 | 
| -- (void)removeVideoTrack:(RTCVideoTrack *)videoTrack {
 | 
| -  NSUInteger index = [_videoTracks indexOfObjectIdenticalTo:videoTrack];
 | 
| -  NSAssert(index != NSNotFound,
 | 
| -           @"|removeVideoTrack| called on unexpected RTCVideoTrack");
 | 
| -  if (index != NSNotFound &&
 | 
| -      _nativeMediaStream->RemoveTrack(videoTrack.nativeVideoTrack)) {
 | 
| -    [_videoTracks removeObjectAtIndex:index];
 | 
| -  }
 | 
| -}
 | 
| -
 | 
| -- (NSString *)description {
 | 
| -  return [NSString stringWithFormat:@"RTCMediaStream:\n%@\nA=%lu\nV=%lu",
 | 
| -                                    self.streamId,
 | 
| -                                    (unsigned long)self.audioTracks.count,
 | 
| -                                    (unsigned long)self.videoTracks.count];
 | 
| -}
 | 
| -
 | 
| -#pragma mark - Private
 | 
| -
 | 
| -- (rtc::scoped_refptr<webrtc::MediaStreamInterface>)nativeMediaStream {
 | 
| -  return _nativeMediaStream;
 | 
| -}
 | 
| -
 | 
| -- (instancetype)initWithNativeMediaStream:
 | 
| -    (rtc::scoped_refptr<webrtc::MediaStreamInterface>)nativeMediaStream {
 | 
| -  NSParameterAssert(nativeMediaStream);
 | 
| -  if (self = [super init]) {
 | 
| -    webrtc::AudioTrackVector audioTracks = nativeMediaStream->GetAudioTracks();
 | 
| -    webrtc::VideoTrackVector videoTracks = nativeMediaStream->GetVideoTracks();
 | 
| -
 | 
| -    _audioTracks = [NSMutableArray arrayWithCapacity:audioTracks.size()];
 | 
| -    _videoTracks = [NSMutableArray arrayWithCapacity:videoTracks.size()];
 | 
| -    _nativeMediaStream = nativeMediaStream;
 | 
| -
 | 
| -    for (auto &track : audioTracks) {
 | 
| -      RTCMediaStreamTrackType type = RTCMediaStreamTrackTypeAudio;
 | 
| -      RTCAudioTrack *audioTrack =
 | 
| -          [[RTCAudioTrack alloc] initWithNativeTrack:track type:type];
 | 
| -      [_audioTracks addObject:audioTrack];
 | 
| -    }
 | 
| -
 | 
| -    for (auto &track : videoTracks) {
 | 
| -      RTCMediaStreamTrackType type = RTCMediaStreamTrackTypeVideo;
 | 
| -      RTCVideoTrack *videoTrack =
 | 
| -          [[RTCVideoTrack alloc] initWithNativeTrack:track type:type];
 | 
| -      [_videoTracks addObject:videoTrack];
 | 
| -    }
 | 
| -  }
 | 
| -  return self;
 | 
| -}
 | 
| -
 | 
| -@end
 | 
| 
 |