Create //webrtc/api:libjingle_peerconnection_api + refactorings.

webrtc/api/mediastream.h

Index: webrtc/api/mediastream.h
diff --git a/webrtc/api/mediastream.h b/webrtc/api/mediastream.h
index 1f80f25207a837668c648987284e2623e83b2eb8..e6556c5833709b0e978884762345e90879c3bc74 100644
--- a/webrtc/api/mediastream.h
+++ b/webrtc/api/mediastream.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2011 The WebRTC project authors. All Rights Reserved.
+ *  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
@@ -8,51 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-// This file contains the implementation of MediaStreamInterface interface.
-
 #ifndef WEBRTC_API_MEDIASTREAM_H_
 #define WEBRTC_API_MEDIASTREAM_H_
 
-#include <string>
-#include <vector>
-
-#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/api/notifier.h"
-
-namespace webrtc {
-
-class MediaStream : public Notifier<MediaStreamInterface> {
- public:
-  static rtc::scoped_refptr<MediaStream> Create(const std::string& label);
-
-  std::string label() const override { return label_; }
-
-  bool AddTrack(AudioTrackInterface* track) override;
-  bool AddTrack(VideoTrackInterface* track) override;
-  bool RemoveTrack(AudioTrackInterface* track) override;
-  bool RemoveTrack(VideoTrackInterface* track) override;
-  rtc::scoped_refptr<AudioTrackInterface>
-      FindAudioTrack(const std::string& track_id) override;
-  rtc::scoped_refptr<VideoTrackInterface>
-      FindVideoTrack(const std::string& track_id) override;
-
-  AudioTrackVector GetAudioTracks() override { return audio_tracks_; }
-  VideoTrackVector GetVideoTracks() override { return video_tracks_; }
-
- protected:
-  explicit MediaStream(const std::string& label);
-
- private:
-  template <typename TrackVector, typename Track>
-  bool AddTrack(TrackVector* Tracks, Track* track);
-  template <typename TrackVector>
-  bool RemoveTrack(TrackVector* Tracks, MediaStreamTrackInterface* track);
-
-  std::string label_;
-  AudioTrackVector audio_tracks_;
-  VideoTrackVector video_tracks_;
-};
-
-}  // namespace webrtc
+// Including this file is deprecated. It is no longer part of the public API.
+// This only includes the file in its new location for backwards compatibility.
+#include "webrtc/pc/mediastream.h"
 
 #endif  // WEBRTC_API_MEDIASTREAM_H_