Move talk/media to webrtc/media

webrtc/media/base/mediaengine.h

Index: webrtc/media/base/mediaengine.h
diff --git a/talk/media/base/mediaengine.h b/webrtc/media/base/mediaengine.h
similarity index 94%
rename from talk/media/base/mediaengine.h
rename to webrtc/media/base/mediaengine.h
index 3f7eec239b4b5b0c9228ce424c1abf9f0ec40f7e..017e7b6af5de520081afbabc1851335d694f8c74 100644
--- a/talk/media/base/mediaengine.h
+++ b/webrtc/media/base/mediaengine.h
@@ -25,8 +25,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TALK_MEDIA_BASE_MEDIAENGINE_H_
-#define TALK_MEDIA_BASE_MEDIAENGINE_H_
+#ifndef WEBRTC_MEDIA_BASE_MEDIAENGINE_H_
+#define WEBRTC_MEDIA_BASE_MEDIAENGINE_H_
 
 #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
 #include <CoreAudio/CoreAudio.h>
@@ -35,15 +35,15 @@
 #include <string>
 #include <vector>
 
-#include "talk/media/base/codec.h"
-#include "talk/media/base/mediachannel.h"
-#include "talk/media/base/mediacommon.h"
-#include "talk/media/base/videocapturer.h"
-#include "talk/media/base/videocommon.h"
-#include "talk/media/devices/devicemanager.h"
 #include "webrtc/audio_state.h"
 #include "webrtc/base/fileutils.h"
 #include "webrtc/base/sigslotrepeater.h"
+#include "webrtc/media/base/codec.h"
+#include "webrtc/media/base/mediachannel.h"
+#include "webrtc/media/base/mediacommon.h"
+#include "webrtc/media/base/videocapturer.h"
+#include "webrtc/media/base/videocommon.h"
+#include "webrtc/media/devices/devicemanager.h"
 
 #if defined(GOOGLE_CHROME_BUILD) || defined(CHROMIUM_BUILD)
 #define DISABLE_MEDIA_ENGINE_FACTORY
@@ -221,4 +221,4 @@ class DataEngineInterface {
 
 }  // namespace cricket
 
-#endif  // TALK_MEDIA_BASE_MEDIAENGINE_H_
+#endif  // WEBRTC_MEDIA_BASE_MEDIAENGINE_H_