Move talk/media to webrtc/media

webrtc/media/base/mediacommon.h

Index: webrtc/media/base/mediacommon.h
diff --git a/webrtc/p2p/base/sessionid.h b/webrtc/media/base/mediacommon.h
similarity index 61%
copy from webrtc/p2p/base/sessionid.h
copy to webrtc/media/base/mediacommon.h
index f69570039b4da7156a19e69960509dfec40cd844..5dd01f19f2e89f8de2e01abed0dba0e8b8e706a4 100644
--- a/webrtc/p2p/base/sessionid.h
+++ b/webrtc/media/base/mediacommon.h
@@ -8,13 +8,20 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_P2P_BASE_SESSIONID_H_
-#define WEBRTC_P2P_BASE_SESSIONID_H_
+#ifndef WEBRTC_MEDIA_BASE_MEDIACOMMON_H_
+#define WEBRTC_MEDIA_BASE_MEDIACOMMON_H_
 
-// TODO: Remove this file.
+#include "webrtc/base/stringencode.h"
 
 namespace cricket {
 
+enum MediaCapabilities {
+  AUDIO_RECV = 1 << 0,
+  AUDIO_SEND = 1 << 1,
+  VIDEO_RECV = 1 << 2,
+  VIDEO_SEND = 1 << 3,
+};

[pthatcher1, 2016/01/27 01:34:09]

This is never used anywhere, and the only references to mediacommon.h are in the
files you are moving/changing.  Can we simply remove the file and all references
to it?

[kjellander_webrtc, 2016/02/04 21:52:10]

Sure, but I still would like to do that in a separate CL. I'll add it to my TODO
for this effort.

+
 }  // namespace cricket
 
-#endif  // WEBRTC_P2P_BASE_SESSIONID_H_
+#endif  // WEBRTC_MEDIA_BASE_MEDIACOMMON_H_