Move talk/media to webrtc/media

webrtc/media/base/mediachannel.h

Index: webrtc/media/base/mediachannel.h
diff --git a/talk/media/base/mediachannel.h b/webrtc/media/base/mediachannel.h
similarity index 99%
rename from talk/media/base/mediachannel.h
rename to webrtc/media/base/mediachannel.h
index b72af4d904f291ab25a9c9a92cd95a5dfcd05235..30d4a45ff21debbf7caa4ba80b17873046193bf4 100644
--- a/talk/media/base/mediachannel.h
+++ b/webrtc/media/base/mediachannel.h
@@ -25,15 +25,12 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TALK_MEDIA_BASE_MEDIACHANNEL_H_
-#define TALK_MEDIA_BASE_MEDIACHANNEL_H_
+#ifndef WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_
+#define WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_
 
 #include <string>
 #include <vector>
 
-#include "talk/media/base/codec.h"
-#include "talk/media/base/constants.h"
-#include "talk/media/base/streamparams.h"
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/buffer.h"
 #include "webrtc/base/dscp.h"
@@ -42,6 +39,9 @@
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/socket.h"
 #include "webrtc/base/window.h"
+#include "webrtc/media/base/codec.h"
+#include "webrtc/media/base/constants.h"
+#include "webrtc/media/base/streamparams.h"
 #include "webrtc/media/base/videosinkinterface.h"
 // TODO(juberti): re-evaluate this include
 #include "talk/session/media/audiomonitor.h"
@@ -1134,4 +1134,4 @@ class DataMediaChannel : public MediaChannel {
 
 }  // namespace cricket
 
-#endif  // TALK_MEDIA_BASE_MEDIACHANNEL_H_
+#endif  // WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_