Rename webrtc/media/webrtc -> webrtc/media/engine
BUG=webrtc:5420
NOTRY=True
R=pthatcher@google.com, pthatcher@webrtc.org
Review URL: https://codereview.webrtc.org/1684163002 .
Cr-Commit-Position: refs/heads/master@{#11591}
diff --git a/webrtc/api/androidvideocapturer.cc b/webrtc/api/androidvideocapturer.cc
index bab1402..4311fd7 100644
--- a/webrtc/api/androidvideocapturer.cc
+++ b/webrtc/api/androidvideocapturer.cc
@@ -14,7 +14,7 @@
#include "webrtc/base/common.h"
#include "webrtc/base/json.h"
#include "webrtc/base/timeutils.h"
-#include "webrtc/media/webrtc/webrtcvideoframe.h"
+#include "webrtc/media/engine/webrtcvideoframe.h"
namespace webrtc {
diff --git a/webrtc/api/java/jni/androidmediadecoder_jni.h b/webrtc/api/java/jni/androidmediadecoder_jni.h
index 73df2ab..8ee23be 100644
--- a/webrtc/api/java/jni/androidmediadecoder_jni.h
+++ b/webrtc/api/java/jni/androidmediadecoder_jni.h
@@ -12,7 +12,7 @@
#define WEBRTC_API_JAVA_JNI_ANDROIDMEDIADECODER_JNI_H_
#include "webrtc/api/java/jni/eglbase_jni.h"
-#include "webrtc/media/webrtc/webrtcvideodecoderfactory.h"
+#include "webrtc/media/engine/webrtcvideodecoderfactory.h"
namespace webrtc_jni {
diff --git a/webrtc/api/java/jni/androidmediaencoder_jni.h b/webrtc/api/java/jni/androidmediaencoder_jni.h
index d7908b4..c0b5f02 100644
--- a/webrtc/api/java/jni/androidmediaencoder_jni.h
+++ b/webrtc/api/java/jni/androidmediaencoder_jni.h
@@ -14,7 +14,7 @@
#include <vector>
#include "webrtc/api/java/jni/eglbase_jni.h"
-#include "webrtc/media/webrtc/webrtcvideoencoderfactory.h"
+#include "webrtc/media/engine/webrtcvideoencoderfactory.h"
namespace webrtc_jni {
diff --git a/webrtc/api/java/jni/peerconnection_jni.cc b/webrtc/api/java/jni/peerconnection_jni.cc
index a19e79a..3997805 100644
--- a/webrtc/api/java/jni/peerconnection_jni.cc
+++ b/webrtc/api/java/jni/peerconnection_jni.cc
@@ -68,8 +68,8 @@
#include "webrtc/media/base/videocapturer.h"
#include "webrtc/media/base/videorenderer.h"
#include "webrtc/media/devices/videorendererfactory.h"
-#include "webrtc/media/webrtc/webrtcvideodecoderfactory.h"
-#include "webrtc/media/webrtc/webrtcvideoencoderfactory.h"
+#include "webrtc/media/engine/webrtcvideodecoderfactory.h"
+#include "webrtc/media/engine/webrtcvideoencoderfactory.h"
#include "webrtc/modules/video_render/video_render_internal.h"
#include "webrtc/system_wrappers/include/field_trial_default.h"
#include "webrtc/system_wrappers/include/logcat_trace_context.h"
diff --git a/webrtc/api/peerconnection_unittest.cc b/webrtc/api/peerconnection_unittest.cc
index b4d6c55..9cb0faf 100644
--- a/webrtc/api/peerconnection_unittest.cc
+++ b/webrtc/api/peerconnection_unittest.cc
@@ -38,7 +38,7 @@
#include "webrtc/base/sslstreamadapter.h"
#include "webrtc/base/thread.h"
#include "webrtc/base/virtualsocketserver.h"
-#include "webrtc/media/webrtc/fakewebrtcvideoengine.h"
+#include "webrtc/media/engine/fakewebrtcvideoengine.h"
#include "webrtc/p2p/base/constants.h"
#include "webrtc/p2p/base/sessiondescription.h"
#include "webrtc/p2p/client/fakeportallocator.h"
diff --git a/webrtc/api/peerconnectionfactory.cc b/webrtc/api/peerconnectionfactory.cc
index 175b607..c3dec66 100644
--- a/webrtc/api/peerconnectionfactory.cc
+++ b/webrtc/api/peerconnectionfactory.cc
@@ -24,9 +24,9 @@
#include "webrtc/api/videosourceproxy.h"
#include "webrtc/api/videotrack.h"
#include "webrtc/base/bind.h"
-#include "webrtc/media/webrtc/webrtcmediaengine.h"
-#include "webrtc/media/webrtc/webrtcvideodecoderfactory.h"
-#include "webrtc/media/webrtc/webrtcvideoencoderfactory.h"
+#include "webrtc/media/engine/webrtcmediaengine.h"
+#include "webrtc/media/engine/webrtcvideodecoderfactory.h"
+#include "webrtc/media/engine/webrtcvideoencoderfactory.h"
#include "webrtc/modules/audio_device/include/audio_device.h"
#include "webrtc/p2p/base/basicpacketsocketfactory.h"
#include "webrtc/p2p/client/basicportallocator.h"
diff --git a/webrtc/api/peerconnectionfactory_unittest.cc b/webrtc/api/peerconnectionfactory_unittest.cc
index 2a0e9c0..b874f95 100644
--- a/webrtc/api/peerconnectionfactory_unittest.cc
+++ b/webrtc/api/peerconnectionfactory_unittest.cc
@@ -23,8 +23,8 @@
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/base/thread.h"
#include "webrtc/media/base/fakevideocapturer.h"
-#include "webrtc/media/webrtc/webrtccommon.h"
-#include "webrtc/media/webrtc/webrtcvoe.h"
+#include "webrtc/media/engine/webrtccommon.h"
+#include "webrtc/media/engine/webrtcvoe.h"
#include "webrtc/p2p/client/fakeportallocator.h"
using webrtc::DataChannelInterface;
diff --git a/webrtc/api/remotevideocapturer_unittest.cc b/webrtc/api/remotevideocapturer_unittest.cc
index 5d9672d..c31272c 100644
--- a/webrtc/api/remotevideocapturer_unittest.cc
+++ b/webrtc/api/remotevideocapturer_unittest.cc
@@ -12,7 +12,7 @@
#include "webrtc/api/remotevideocapturer.h"
#include "webrtc/base/gunit.h"
-#include "webrtc/media/webrtc/webrtcvideoframe.h"
+#include "webrtc/media/engine/webrtcvideoframe.h"
using cricket::CaptureState;
using cricket::VideoCapturer;
diff --git a/webrtc/api/videosource_unittest.cc b/webrtc/api/videosource_unittest.cc
index 8742529..d8ca1a5 100644
--- a/webrtc/api/videosource_unittest.cc
+++ b/webrtc/api/videosource_unittest.cc
@@ -19,7 +19,7 @@
#include "webrtc/media/base/fakemediaengine.h"
#include "webrtc/media/base/fakevideocapturer.h"
#include "webrtc/media/base/fakevideorenderer.h"
-#include "webrtc/media/webrtc/webrtcvideoframe.h"
+#include "webrtc/media/engine/webrtcvideoframe.h"
using webrtc::FakeConstraints;
using webrtc::VideoSource;
diff --git a/webrtc/api/videotrack_unittest.cc b/webrtc/api/videotrack_unittest.cc
index d451863..face9f9 100644
--- a/webrtc/api/videotrack_unittest.cc
+++ b/webrtc/api/videotrack_unittest.cc
@@ -18,7 +18,7 @@
#include "webrtc/base/gunit.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/media/base/fakemediaengine.h"
-#include "webrtc/media/webrtc/webrtcvideoframe.h"
+#include "webrtc/media/engine/webrtcvideoframe.h"
using webrtc::FakeVideoTrackRenderer;
using webrtc::VideoSource;
diff --git a/webrtc/api/videotrackrenderers.cc b/webrtc/api/videotrackrenderers.cc
index a76becd..4800d3b 100644
--- a/webrtc/api/videotrackrenderers.cc
+++ b/webrtc/api/videotrackrenderers.cc
@@ -9,7 +9,7 @@
*/
#include "webrtc/api/videotrackrenderers.h"
-#include "webrtc/media/webrtc/webrtcvideoframe.h"
+#include "webrtc/media/engine/webrtcvideoframe.h"
namespace webrtc {
diff --git a/webrtc/api/webrtcsession_unittest.cc b/webrtc/api/webrtcsession_unittest.cc
index 8bbcb58..56699ba 100644
--- a/webrtc/api/webrtcsession_unittest.cc
+++ b/webrtc/api/webrtcsession_unittest.cc
@@ -42,7 +42,7 @@
#include "webrtc/media/base/fakemediaengine.h"
#include "webrtc/media/base/fakevideorenderer.h"
#include "webrtc/media/base/mediachannel.h"
-#include "webrtc/media/webrtc/fakewebrtccall.h"
+#include "webrtc/media/engine/fakewebrtccall.h"
#include "webrtc/p2p/base/stunserver.h"
#include "webrtc/p2p/base/teststunserver.h"
#include "webrtc/p2p/base/testturnserver.h"