Move talk/media to webrtc/media

talk/session/media/mediamonitor.h

 /*
  * libjingle
  * Copyright 2005 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 12 matching lines @@
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 // Class to collect statistics from a media channel
 
 #ifndef TALK_SESSION_MEDIA_MEDIAMONITOR_H_
 #define TALK_SESSION_MEDIA_MEDIAMONITOR_H_
 
-#include "talk/media/base/mediachannel.h"
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/thread.h"
 #include "webrtc/base/thread_annotations.h"
+#include "webrtc/media/base/mediachannel.h"
 
 namespace cricket {
 
 // The base MediaMonitor class, independent of voice and video.
 class MediaMonitor : public rtc::MessageHandler,
     public sigslot::has_slots<> {
  public:
   MediaMonitor(rtc::Thread* worker_thread,
                rtc::Thread* monitor_thread);
   ~MediaMonitor();
@@ skipping 42 matching lines @@
   MI media_info_;
 };
 
 typedef MediaMonitorT<VoiceMediaChannel, VoiceMediaInfo> VoiceMediaMonitor;
 typedef MediaMonitorT<VideoMediaChannel, VideoMediaInfo> VideoMediaMonitor;
 typedef MediaMonitorT<DataMediaChannel, DataMediaInfo> DataMediaMonitor;
 
 }  // namespace cricket
 
 #endif  // TALK_SESSION_MEDIA_MEDIAMONITOR_H_