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}

talk/session/media/channelmanager_unittest.cc

@@ -34,7 +34,7 @@
 #include "webrtc/media/base/fakemediaengine.h"
 #include "webrtc/media/base/fakevideocapturer.h"
 #include "webrtc/media/base/testutils.h"
-#include "webrtc/media/webrtc/fakewebrtccall.h"
+#include "webrtc/media/engine/fakewebrtccall.h"
 #include "webrtc/p2p/base/faketransportcontroller.h"
 
 namespace cricket {

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 {
 

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 {
 

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 {
 

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/engine/webrtcvideodecoderfactory.h"
-#include "webrtc/media/webrtc/webrtcvideoencoderfactory.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"

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"

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/engine/webrtcmediaengine.h"
-#include "webrtc/media/webrtc/webrtcvideodecoderfactory.h"
+#include "webrtc/media/engine/webrtcvideodecoderfactory.h"
-#include "webrtc/media/webrtc/webrtcvideoencoderfactory.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"

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/engine/webrtccommon.h"
-#include "webrtc/media/webrtc/webrtcvoe.h"
+#include "webrtc/media/engine/webrtcvoe.h"
 #include "webrtc/p2p/client/fakeportallocator.h"
 
 using webrtc::DataChannelInterface;

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;

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;

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;

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 {
 

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"

webrtc/media/base/fakevideocapturer.h

@@ -20,7 +20,7 @@
 #include "webrtc/media/base/videocommon.h"
 #include "webrtc/media/base/videoframe.h"
 #ifdef HAVE_WEBRTC_VIDEO
-#include "webrtc/media/webrtc/webrtcvideoframefactory.h"
+#include "webrtc/media/engine/webrtcvideoframefactory.h"
 #endif
 
 namespace cricket {

webrtc/media/base/mediaengine.cc

@@ -13,7 +13,7 @@
 #if !defined(DISABLE_MEDIA_ENGINE_FACTORY)
 
 #if defined(HAVE_WEBRTC_VOICE) && defined(HAVE_WEBRTC_VIDEO)
-#include "webrtc/media/webrtc/webrtcmediaengine.h"
+#include "webrtc/media/engine/webrtcmediaengine.h"
 #endif  // HAVE_WEBRTC_VOICE && HAVE_WEBRTC_VIDEO
 
 #ifdef HAVE_CONFIG_H

webrtc/media/base/videocapturer.cc

@@ -21,8 +21,8 @@
 #include "webrtc/media/base/videoframefactory.h"
 
 #if defined(HAVE_WEBRTC_VIDEO)
-#include "webrtc/media/webrtc/webrtcvideoframe.h"
+#include "webrtc/media/engine/webrtcvideoframe.h"
-#include "webrtc/media/webrtc/webrtcvideoframefactory.h"
+#include "webrtc/media/engine/webrtcvideoframefactory.h"
 #endif  // HAVE_WEBRTC_VIDEO
 
 namespace cricket {

webrtc/media/base/videoengine_unittest.h

@@ -23,7 +23,7 @@
 #include "webrtc/media/base/fakevideorenderer.h"
 #include "webrtc/media/base/mediachannel.h"
 #include "webrtc/media/base/streamparams.h"
-#include "webrtc/media/webrtc/fakewebrtccall.h"
+#include "webrtc/media/engine/fakewebrtccall.h"
 
 #define EXPECT_FRAME_WAIT(c, w, h, t) \
   EXPECT_EQ_WAIT((c), renderer_.num_rendered_frames(), (t)); \

webrtc/media/devices/devicemanager.cc

@@ -23,7 +23,7 @@
 #include "webrtc/media/devices/deviceinfo.h"
 
 #ifdef HAVE_WEBRTC_VIDEO
-#include "webrtc/media/webrtc/webrtcvideocapturerfactory.h"
+#include "webrtc/media/engine/webrtcvideocapturerfactory.h"
 #endif  // HAVE_WEBRTC_VIDEO
 
 namespace {

webrtc/media/engine/constants.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_WEBRTC_CONSTANTS_H_
+#ifndef WEBRTC_MEDIA_ENGINE_CONSTANTS_H_
-#define WEBRTC_MEDIA_WEBRTC_CONSTANTS_H_
+#define WEBRTC_MEDIA_ENGINE_CONSTANTS_H_
 
 namespace cricket {
 
@@ -24,4 +24,4 @@ extern const int kMaxVideoBitrate;
 
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_WEBRTC_CONSTANTS_H_
+#endif  // WEBRTC_MEDIA_ENGINE_CONSTANTS_H_

webrtc/media/engine/fakewebrtccall.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/media/webrtc/fakewebrtccall.h"
+#include "webrtc/media/engine/fakewebrtccall.h"
 
 #include <algorithm>
 #include <utility>

webrtc/media/engine/fakewebrtccall.h

@@ -17,8 +17,8 @@
 //   webrtc::VideoSendStream
 //   webrtc::VideoReceiveStream
 
-#ifndef WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCCALL_H_
+#ifndef WEBRTC_MEDIA_ENGINE_FAKEWEBRTCCALL_H_
-#define WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCCALL_H_
+#define WEBRTC_MEDIA_ENGINE_FAKEWEBRTCCALL_H_
 
 #include <vector>
 

webrtc/media/engine/fakewebrtccommon.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCCOMMON_H_
+#ifndef WEBRTC_MEDIA_ENGINE_FAKEWEBRTCCOMMON_H_
-#define WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCCOMMON_H_
+#define WEBRTC_MEDIA_ENGINE_FAKEWEBRTCCOMMON_H_
 
 #include "webrtc/base/common.h"
 
@@ -39,4 +39,4 @@ namespace cricket {
 #define WEBRTC_VOID_FUNC(method, args) void method args override
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCCOMMON_H_
+#endif  // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCCOMMON_H_

webrtc/media/engine/fakewebrtcdeviceinfo.h

@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCDEVICEINFO_H_
+#ifndef WEBRTC_MEDIA_ENGINE_FAKEWEBRTCDEVICEINFO_H_
-#define WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCDEVICEINFO_H_
+#define WEBRTC_MEDIA_ENGINE_FAKEWEBRTCDEVICEINFO_H_
 
 #include <vector>
 
 #include "webrtc/base/stringutils.h"
-#include "webrtc/media/webrtc/webrtcvideocapturer.h"
+#include "webrtc/media/engine/webrtcvideocapturer.h"
 
 // Fake class for mocking out webrtc::VideoCaptureModule::DeviceInfo.
 class FakeWebRtcDeviceInfo : public webrtc::VideoCaptureModule::DeviceInfo {
@@ -105,4 +105,4 @@ class FakeWebRtcDeviceInfo : public webrtc::VideoCaptureModule::DeviceInfo {
   std::vector<Device> devices_;
 };
 
-#endif  // WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCDEVICEINFO_H_
+#endif  // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCDEVICEINFO_H_

webrtc/media/engine/fakewebrtcvcmfactory.h

@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCVCMFACTORY_H_
+#ifndef WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVCMFACTORY_H_
-#define WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCVCMFACTORY_H_
+#define WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVCMFACTORY_H_
 
 #include <vector>
 
-#include "webrtc/media/webrtc/fakewebrtcvideocapturemodule.h"
+#include "webrtc/media/engine/fakewebrtcvideocapturemodule.h"
-#include "webrtc/media/webrtc/webrtcvideocapturer.h"
+#include "webrtc/media/engine/webrtcvideocapturer.h"
 
 // Factory class to allow the fakes above to be injected into
 // WebRtcVideoCapturer.
@@ -45,4 +45,4 @@ FakeWebRtcVideoCaptureModule::~FakeWebRtcVideoCaptureModule() {
     factory_->OnDestroyed(this);
 }
 
-#endif  // WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCVCMFACTORY_H_
+#endif  // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVCMFACTORY_H_

webrtc/media/engine/fakewebrtcvideocapturemodule.h

@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCVIDEOCAPTUREMODULE_H_
+#ifndef WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVIDEOCAPTUREMODULE_H_
-#define WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCVIDEOCAPTUREMODULE_H_
+#define WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVIDEOCAPTUREMODULE_H_
 
 #include <vector>
 
 #include "webrtc/media/base/testutils.h"
-#include "webrtc/media/webrtc/fakewebrtcdeviceinfo.h"
+#include "webrtc/media/engine/fakewebrtcdeviceinfo.h"
-#include "webrtc/media/webrtc/webrtcvideocapturer.h"
+#include "webrtc/media/engine/webrtcvideocapturer.h"
 
 class FakeWebRtcVcmFactory;
 
@@ -119,4 +119,4 @@ class FakeWebRtcVideoCaptureModule : public webrtc::VideoCaptureModule {
   int delay_;
 };
 
-#endif  // WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCVIDEOCAPTUREMODULE_H_
+#endif  // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVIDEOCAPTUREMODULE_H_

webrtc/media/engine/fakewebrtcvideoengine.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCVIDEOENGINE_H_
+#ifndef WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_
-#define WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCVIDEOENGINE_H_
+#define WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_
 
 #include <map>
 #include <set>
@@ -21,9 +21,9 @@
 #include "webrtc/base/stringutils.h"
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/media/base/codec.h"
-#include "webrtc/media/webrtc/fakewebrtccommon.h"
+#include "webrtc/media/engine/fakewebrtccommon.h"
-#include "webrtc/media/webrtc/webrtcvideodecoderfactory.h"
+#include "webrtc/media/engine/webrtcvideodecoderfactory.h"
-#include "webrtc/media/webrtc/webrtcvideoencoderfactory.h"
+#include "webrtc/media/engine/webrtcvideoencoderfactory.h"
 #include "webrtc/modules/video_coding/include/video_error_codes.h"
 #include "webrtc/video_decoder.h"
 #include "webrtc/video_encoder.h"
@@ -233,4 +233,4 @@ class FakeWebRtcVideoEncoderFactory : public WebRtcVideoEncoderFactory {
 
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCVIDEOENGINE_H_
+#endif  // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_

webrtc/media/engine/fakewebrtcvoiceengine.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCVOICEENGINE_H_
+#ifndef WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVOICEENGINE_H_
-#define WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCVOICEENGINE_H_
+#define WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVOICEENGINE_H_
 
 #include <list>
 #include <map>
@@ -22,8 +22,8 @@
 #include "webrtc/config.h"
 #include "webrtc/media/base/codec.h"
 #include "webrtc/media/base/rtputils.h"
-#include "webrtc/media/webrtc/fakewebrtccommon.h"
+#include "webrtc/media/engine/fakewebrtccommon.h"
-#include "webrtc/media/webrtc/webrtcvoe.h"
+#include "webrtc/media/engine/webrtcvoe.h"
 #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
 #include "webrtc/modules/audio_processing/include/audio_processing.h"
 
@@ -805,4 +805,4 @@ class FakeWebRtcVoiceEngine
 
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_WEBRTC_FAKEWEBRTCVOICEENGINE_H_
+#endif  // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVOICEENGINE_H_

webrtc/media/engine/nullwebrtcvideoengine.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_WEBRTC_NULLWEBRTCVIDEOENGINE_H_
+#ifndef WEBRTC_MEDIA_ENGINE_NULLWEBRTCVIDEOENGINE_H_
-#define WEBRTC_MEDIA_WEBRTC_NULLWEBRTCVIDEOENGINE_H_
+#define WEBRTC_MEDIA_ENGINE_NULLWEBRTCVIDEOENGINE_H_
 
 #include <vector>
 
@@ -61,4 +61,4 @@ class NullWebRtcVideoEngine {
 
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_WEBRTC_NULLWEBRTCVIDEOENGINE_H_
+#endif  // WEBRTC_MEDIA_ENGINE_NULLWEBRTCVIDEOENGINE_H_

webrtc/media/engine/nullwebrtcvideoengine_unittest.cc

@@ -10,8 +10,8 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 
-#include "webrtc/media/webrtc/nullwebrtcvideoengine.h"
+#include "webrtc/media/engine/nullwebrtcvideoengine.h"
-#include "webrtc/media/webrtc/webrtcvoiceengine.h"
+#include "webrtc/media/engine/webrtcvoiceengine.h"
 
 namespace cricket {
 

webrtc/media/engine/simulcast.cc

@@ -14,7 +14,7 @@
 #include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/media/base/streamparams.h"
-#include "webrtc/media/webrtc/simulcast.h"
+#include "webrtc/media/engine/simulcast.h"
 #include "webrtc/system_wrappers/include/field_trial.h"
 
 namespace cricket {

webrtc/media/engine/simulcast.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_WEBRTC_SIMULCAST_H_
+#ifndef WEBRTC_MEDIA_ENGINE_SIMULCAST_H_
-#define WEBRTC_MEDIA_WEBRTC_SIMULCAST_H_
+#define WEBRTC_MEDIA_ENGINE_SIMULCAST_H_
 
 #include <vector>
 
@@ -54,4 +54,4 @@ std::vector<webrtc::VideoStream> GetSimulcastConfig(size_t max_streams,
 
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_WEBRTC_SIMULCAST_H_
+#endif  // WEBRTC_MEDIA_ENGINE_SIMULCAST_H_

webrtc/media/engine/simulcast_unittest.cc

@@ -11,7 +11,7 @@
 #include <string>
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webrtc/media/webrtc/simulcast.h"
+#include "webrtc/media/engine/simulcast.h"
 
 namespace cricket {
 

webrtc/media/engine/webrtccommon.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_WEBRTC_WEBRTCCOMMON_H_
+#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCCOMMON_H_
-#define WEBRTC_MEDIA_WEBRTC_WEBRTCCOMMON_H_
+#define WEBRTC_MEDIA_ENGINE_WEBRTCCOMMON_H_
 
 #include "webrtc/common_types.h"
 
@@ -55,4 +55,4 @@ namespace cricket {
 
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_WEBRTC_WEBRTCCOMMON_H_
+#endif  // WEBRTC_MEDIA_ENGINE_WEBRTCCOMMON_H_

webrtc/media/engine/webrtcmediaengine.cc

@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/media/webrtc/webrtcmediaengine.h"
+#include "webrtc/media/engine/webrtcmediaengine.h"
 
 #include <algorithm>
 
 #ifdef HAVE_WEBRTC_VIDEO
-#include "webrtc/media/webrtc/webrtcvideoengine2.h"
+#include "webrtc/media/engine/webrtcvideoengine2.h"
 #else
-#include "webrtc/media/webrtc/nullwebrtcvideoengine.h"
+#include "webrtc/media/engine/nullwebrtcvideoengine.h"
 #endif
-#include "webrtc/media/webrtc/webrtcvoiceengine.h"
+#include "webrtc/media/engine/webrtcvoiceengine.h"
 
 namespace cricket {
 

webrtc/media/engine/webrtcmediaengine.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_WEBRTC_WEBRTCMEDIAENGINE_H_
+#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_
-#define WEBRTC_MEDIA_WEBRTC_WEBRTCMEDIAENGINE_H_
+#define WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_
 
 #include <string>
 #include <vector>
@@ -50,4 +50,4 @@ std::vector<webrtc::RtpExtension> FilterRtpExtensions(
 
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_WEBRTC_WEBRTCMEDIAENGINE_H_
+#endif  // WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_

webrtc/media/engine/webrtcmediaengine_unittest.cc

@@ -10,7 +10,7 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 
-#include "webrtc/media/webrtc/webrtcmediaengine.h"
+#include "webrtc/media/engine/webrtcmediaengine.h"
 
 namespace cricket {
 namespace {

webrtc/media/engine/webrtcvideocapturer.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/media/webrtc/webrtcvideocapturer.h"
+#include "webrtc/media/engine/webrtcvideocapturer.h"
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -23,8 +23,8 @@
 #include "webrtc/base/safe_conversions.h"
 #include "webrtc/base/thread.h"
 #include "webrtc/base/timeutils.h"
-#include "webrtc/media/webrtc/webrtcvideoframe.h"
+#include "webrtc/media/engine/webrtcvideoframe.h"
-#include "webrtc/media/webrtc/webrtcvideoframefactory.h"
+#include "webrtc/media/engine/webrtcvideoframefactory.h"
 
 #include "webrtc/base/win32.h"  // Need this to #include the impl files.
 #include "webrtc/modules/video_capture/video_capture_factory.h"

webrtc/media/engine/webrtcvideocapturer.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOCAPTURER_H_
+#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOCAPTURER_H_
-#define WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOCAPTURER_H_
+#define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOCAPTURER_H_
 
 #ifdef HAVE_WEBRTC_VIDEO
 
@@ -21,7 +21,7 @@
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/media/base/videocapturer.h"
-#include "webrtc/media/webrtc/webrtcvideoframe.h"
+#include "webrtc/media/engine/webrtcvideoframe.h"
 #include "webrtc/modules/video_capture/video_capture.h"
 
 namespace cricket {
@@ -96,4 +96,4 @@ struct WebRtcCapturedFrame : public CapturedFrame {
 }  // namespace cricket
 
 #endif  // HAVE_WEBRTC_VIDEO
-#endif  // WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOCAPTURER_H_
+#endif  // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOCAPTURER_H_

webrtc/media/engine/webrtcvideocapturer_unittest.cc

@@ -18,8 +18,8 @@
 #include "webrtc/base/thread.h"
 #include "webrtc/media/base/testutils.h"
 #include "webrtc/media/base/videocommon.h"
-#include "webrtc/media/webrtc/fakewebrtcvcmfactory.h"
+#include "webrtc/media/engine/fakewebrtcvcmfactory.h"
-#include "webrtc/media/webrtc/webrtcvideocapturer.h"
+#include "webrtc/media/engine/webrtcvideocapturer.h"
 
 using cricket::VideoFormat;
 

webrtc/media/engine/webrtcvideocapturerfactory.cc

@@ -9,8 +9,8 @@
  */
 
 #include "webrtc/base/scoped_ptr.h"
-#include "webrtc/media/webrtc/webrtcvideocapturer.h"
+#include "webrtc/media/engine/webrtcvideocapturer.h"
-#include "webrtc/media/webrtc/webrtcvideocapturerfactory.h"
+#include "webrtc/media/engine/webrtcvideocapturerfactory.h"
 
 namespace cricket {
 

webrtc/media/engine/webrtcvideocapturerfactory.h

@@ -9,8 +9,8 @@
  */
 
 // TODO(pthatcher): Rename file to match class name.
-#ifndef WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOCAPTURERFACTORY_H_
+#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOCAPTURERFACTORY_H_
-#define WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOCAPTURERFACTORY_H_
+#define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOCAPTURERFACTORY_H_
 
 #include "webrtc/media/base/videocapturerfactory.h"
 
@@ -24,4 +24,4 @@ class WebRtcVideoDeviceCapturerFactory : public VideoDeviceCapturerFactory {
 
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOCAPTURERFACTORY_H_
+#endif  // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOCAPTURERFACTORY_H_

webrtc/media/engine/webrtcvideochannelfactory.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOCHANNELFACTORY_H_
+#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOCHANNELFACTORY_H_
-#define WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOCHANNELFACTORY_H_
+#define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOCHANNELFACTORY_H_
 
 namespace cricket {
 class VoiceMediaChannel;
@@ -24,4 +24,4 @@ class WebRtcVideoChannelFactory {
 };
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOCHANNELFACTORY_H_
+#endif  // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOCHANNELFACTORY_H_

webrtc/media/engine/webrtcvideodecoderfactory.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEODECODERFACTORY_H_
+#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_
-#define WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEODECODERFACTORY_H_
+#define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_
 
 #include "webrtc/base/refcount.h"
 #include "webrtc/common_types.h"
@@ -33,4 +33,4 @@ class WebRtcVideoDecoderFactory {
 
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEODECODERFACTORY_H_
+#endif  // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_

webrtc/media/engine/webrtcvideoencoderfactory.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOENCODERFACTORY_H_
+#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENCODERFACTORY_H_
-#define WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOENCODERFACTORY_H_
+#define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENCODERFACTORY_H_
 
 #include "webrtc/base/refcount.h"
 #include "webrtc/common_types.h"
@@ -60,4 +60,4 @@ class WebRtcVideoEncoderFactory {
 
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOENCODERFACTORY_H_
+#endif  // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENCODERFACTORY_H_

webrtc/media/engine/webrtcvideoengine2.cc

@@ -9,7 +9,7 @@
  */
 
 #ifdef HAVE_WEBRTC_VIDEO
-#include "webrtc/media/webrtc/webrtcvideoengine2.h"
+#include "webrtc/media/engine/webrtcvideoengine2.h"
 
 #include <algorithm>
 #include <set>
@@ -23,12 +23,12 @@
 #include "webrtc/call.h"
 #include "webrtc/media/base/videocapturer.h"
 #include "webrtc/media/base/videorenderer.h"
-#include "webrtc/media/webrtc/constants.h"
+#include "webrtc/media/engine/constants.h"
-#include "webrtc/media/webrtc/simulcast.h"
+#include "webrtc/media/engine/simulcast.h"
-#include "webrtc/media/webrtc/webrtcmediaengine.h"
+#include "webrtc/media/engine/webrtcmediaengine.h"
-#include "webrtc/media/webrtc/webrtcvideoencoderfactory.h"
+#include "webrtc/media/engine/webrtcvideoencoderfactory.h"
-#include "webrtc/media/webrtc/webrtcvideoframe.h"
+#include "webrtc/media/engine/webrtcvideoframe.h"
-#include "webrtc/media/webrtc/webrtcvoiceengine.h"
+#include "webrtc/media/engine/webrtcvoiceengine.h"
 #include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
 #include "webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h"
 #include "webrtc/system_wrappers/include/field_trial.h"
@@ -317,7 +317,7 @@ static int GetMaxDefaultVideoBitrateKbps(int width, int height) {
 }
 }  // namespace
 
-// Constants defined in webrtc/media/webrtc/constants.h
+// Constants defined in webrtc/media/engine/constants.h
 // TODO(pbos): Move these to a separate constants.cc file.
 const int kMinVideoBitrate = 30;
 const int kStartVideoBitrate = 300;

webrtc/media/engine/webrtcvideoengine2.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_
+#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_
-#define WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_
+#define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_
 
 #include <map>
 #include <string>
@@ -22,9 +22,9 @@
 #include "webrtc/media/base/videosinkinterface.h"
 #include "webrtc/call.h"
 #include "webrtc/media/base/mediaengine.h"
-#include "webrtc/media/webrtc/webrtcvideochannelfactory.h"
+#include "webrtc/media/engine/webrtcvideochannelfactory.h"
-#include "webrtc/media/webrtc/webrtcvideodecoderfactory.h"
+#include "webrtc/media/engine/webrtcvideodecoderfactory.h"
-#include "webrtc/media/webrtc/webrtcvideoencoderfactory.h"
+#include "webrtc/media/engine/webrtcvideoencoderfactory.h"
 #include "webrtc/transport.h"
 #include "webrtc/video_frame.h"
 #include "webrtc/video_receive_stream.h"
@@ -512,4 +512,4 @@ class WebRtcVideoChannel2 : public VideoMediaChannel,
 
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_
+#endif  // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_

webrtc/media/engine/webrtcvideoengine2_unittest.cc

@@ -19,12 +19,12 @@
 #include "webrtc/base/stringutils.h"
 #include "webrtc/media/base/testutils.h"
 #include "webrtc/media/base/videoengine_unittest.h"
-#include "webrtc/media/webrtc/fakewebrtccall.h"
+#include "webrtc/media/engine/fakewebrtccall.h"
-#include "webrtc/media/webrtc/fakewebrtcvideoengine.h"
+#include "webrtc/media/engine/fakewebrtcvideoengine.h"
-#include "webrtc/media/webrtc/simulcast.h"
+#include "webrtc/media/engine/simulcast.h"
-#include "webrtc/media/webrtc/webrtcvideochannelfactory.h"
+#include "webrtc/media/engine/webrtcvideochannelfactory.h"
-#include "webrtc/media/webrtc/webrtcvideoengine2.h"
+#include "webrtc/media/engine/webrtcvideoengine2.h"
-#include "webrtc/media/webrtc/webrtcvoiceengine.h"
+#include "webrtc/media/engine/webrtcvoiceengine.h"
 #include "webrtc/test/field_trial.h"
 #include "webrtc/video_encoder.h"
 

webrtc/media/engine/webrtcvideoframe.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/media/webrtc/webrtcvideoframe.h"
+#include "webrtc/media/engine/webrtcvideoframe.h"
 
 #include "libyuv/convert.h"
 #include "webrtc/base/logging.h"

webrtc/media/engine/webrtcvideoframe.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOFRAME_H_
+#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOFRAME_H_
-#define WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOFRAME_H_
+#define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOFRAME_H_
 
 #include "webrtc/base/buffer.h"
 #include "webrtc/base/refcount.h"
@@ -118,4 +118,4 @@ class WebRtcVideoFrame : public VideoFrame {
 
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOFRAME_H_
+#endif  // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOFRAME_H_

webrtc/media/engine/webrtcvideoframe_unittest.cc

@@ -11,7 +11,7 @@
 #include <string.h>
 
 #include "webrtc/media/base/videoframe_unittest.h"
-#include "webrtc/media/webrtc/webrtcvideoframe.h"
+#include "webrtc/media/engine/webrtcvideoframe.h"
 #include "webrtc/test/fake_texture_frame.h"
 
 namespace {

webrtc/media/engine/webrtcvideoframefactory.cc

@@ -9,8 +9,8 @@
  */
 
 #include "webrtc/base/logging.h"
-#include "webrtc/media/webrtc/webrtcvideoframe.h"
+#include "webrtc/media/engine/webrtcvideoframe.h"
-#include "webrtc/media/webrtc/webrtcvideoframefactory.h"
+#include "webrtc/media/engine/webrtcvideoframefactory.h"
 
 namespace cricket {
 

webrtc/media/engine/webrtcvideoframefactory.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOFRAMEFACTORY_H_
+#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOFRAMEFACTORY_H_
-#define WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOFRAMEFACTORY_H_
+#define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOFRAMEFACTORY_H_
 
 #include "webrtc/media/base/videoframefactory.h"
 
@@ -27,4 +27,4 @@ class WebRtcVideoFrameFactory : public VideoFrameFactory {
 
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOFRAMEFACTORY_H_
+#endif  // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOFRAMEFACTORY_H_

webrtc/media/engine/webrtcvideoframefactory_unittest.cc

@@ -11,8 +11,8 @@
 #include <string.h>
 
 #include "webrtc/media/base/videoframe_unittest.h"
-#include "webrtc/media/webrtc/webrtcvideoframe.h"
+#include "webrtc/media/engine/webrtcvideoframe.h"
-#include "webrtc/media/webrtc/webrtcvideoframefactory.h"
+#include "webrtc/media/engine/webrtcvideoframefactory.h"
 
 class WebRtcVideoFrameFactoryTest
     : public VideoFrameTest<cricket::WebRtcVideoFrameFactory> {

webrtc/media/engine/webrtcvoe.h

@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_WEBRTC_WEBRTCVOE_H_
+#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVOE_H_
-#define WEBRTC_MEDIA_WEBRTC_WEBRTCVOE_H_
+#define WEBRTC_MEDIA_ENGINE_WEBRTCVOE_H_
 
 #include "webrtc/base/common.h"
-#include "webrtc/media/webrtc/webrtccommon.h"
+#include "webrtc/media/engine/webrtccommon.h"
 
 #include "webrtc/common_types.h"
 #include "webrtc/modules/audio_device/include/audio_device.h"
@@ -116,4 +116,4 @@ class VoEWrapper {
 };
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_WEBRTC_WEBRTCVOE_H_
+#endif  // WEBRTC_MEDIA_ENGINE_WEBRTCVOE_H_

webrtc/media/engine/webrtcvoiceengine.cc

@@ -14,7 +14,7 @@
 
 #ifdef HAVE_WEBRTC_VOICE
 
-#include "webrtc/media/webrtc/webrtcvoiceengine.h"
+#include "webrtc/media/engine/webrtcvoiceengine.h"
 
 #include <algorithm>
 #include <cstdio>
@@ -36,8 +36,8 @@
 #include "webrtc/media/base/audiorenderer.h"
 #include "webrtc/media/base/constants.h"
 #include "webrtc/media/base/streamparams.h"
-#include "webrtc/media/webrtc/webrtcmediaengine.h"
+#include "webrtc/media/engine/webrtcmediaengine.h"
-#include "webrtc/media/webrtc/webrtcvoe.h"
+#include "webrtc/media/engine/webrtcvoe.h"
 #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
 #include "webrtc/modules/audio_processing/include/audio_processing.h"
 #include "webrtc/system_wrappers/include/field_trial.h"

webrtc/media/engine/webrtcvoiceengine.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_WEBRTC_WEBRTCVOICEENGINE_H_
+#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVOICEENGINE_H_
-#define WEBRTC_MEDIA_WEBRTC_WEBRTCVOICEENGINE_H_
+#define WEBRTC_MEDIA_ENGINE_WEBRTCVOICEENGINE_H_
 
 #include <map>
 #include <string>
@@ -25,8 +25,8 @@
 #include "webrtc/common.h"
 #include "webrtc/config.h"
 #include "webrtc/media/base/rtputils.h"
-#include "webrtc/media/webrtc/webrtccommon.h"
+#include "webrtc/media/engine/webrtccommon.h"
-#include "webrtc/media/webrtc/webrtcvoe.h"
+#include "webrtc/media/engine/webrtcvoe.h"
 
 namespace cricket {
 
@@ -272,4 +272,4 @@ class WebRtcVoiceMediaChannel final : public VoiceMediaChannel,
 };
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_WEBRTC_WEBRTCVOICEENGINE_H_
+#endif  // WEBRTC_MEDIA_ENGINE_WEBRTCVOICEENGINE_H_

webrtc/media/engine/webrtcvoiceengine_unittest.cc

@@ -19,9 +19,9 @@
 #include "webrtc/media/base/fakemediaengine.h"
 #include "webrtc/media/base/fakenetworkinterface.h"
 #include "webrtc/media/base/fakertp.h"
-#include "webrtc/media/webrtc/fakewebrtccall.h"
+#include "webrtc/media/engine/fakewebrtccall.h"
-#include "webrtc/media/webrtc/fakewebrtcvoiceengine.h"
+#include "webrtc/media/engine/fakewebrtcvoiceengine.h"
-#include "webrtc/media/webrtc/webrtcvoiceengine.h"
+#include "webrtc/media/engine/webrtcvoiceengine.h"
 
 using cricket::kRtpAudioLevelHeaderExtension;
 using cricket::kRtpAbsoluteSenderTimeHeaderExtension;

webrtc/media/media.gyp

@@ -81,30 +81,30 @@
         'devices/devicemanager.h',
         'devices/dummydevicemanager.h',
         'devices/videorendererfactory.h',
+        'engine/nullwebrtcvideoengine.h',
+        'engine/simulcast.cc',
+        'engine/simulcast.h',
+        'engine/webrtccommon.h',
+        'engine/webrtcmediaengine.cc',
+        'engine/webrtcmediaengine.h',
+        'engine/webrtcmediaengine.cc',
+        'engine/webrtcvideocapturer.cc',
+        'engine/webrtcvideocapturer.h',
+        'engine/webrtcvideocapturerfactory.h',
+        'engine/webrtcvideocapturerfactory.cc',
+        'engine/webrtcvideodecoderfactory.h',
+        'engine/webrtcvideoencoderfactory.h',
+        'engine/webrtcvideoengine2.cc',
+        'engine/webrtcvideoengine2.h',
+        'engine/webrtcvideoframe.cc',
+        'engine/webrtcvideoframe.h',
+        'engine/webrtcvideoframefactory.cc',
+        'engine/webrtcvideoframefactory.h',
+        'engine/webrtcvoe.h',
+        'engine/webrtcvoiceengine.cc',
+        'engine/webrtcvoiceengine.h',
         'sctp/sctpdataengine.cc',
         'sctp/sctpdataengine.h',
-        'webrtc/nullwebrtcvideoengine.h',
-        'webrtc/simulcast.cc',
-        'webrtc/simulcast.h',
-        'webrtc/webrtccommon.h',
-        'webrtc/webrtcmediaengine.cc',
-        'webrtc/webrtcmediaengine.h',
-        'webrtc/webrtcmediaengine.cc',
-        'webrtc/webrtcvideocapturer.cc',
-        'webrtc/webrtcvideocapturer.h',
-        'webrtc/webrtcvideocapturerfactory.h',
-        'webrtc/webrtcvideocapturerfactory.cc',
-        'webrtc/webrtcvideodecoderfactory.h',
-        'webrtc/webrtcvideoencoderfactory.h',
-        'webrtc/webrtcvideoengine2.cc',
-        'webrtc/webrtcvideoengine2.h',
-        'webrtc/webrtcvideoframe.cc',
-        'webrtc/webrtcvideoframe.h',
-        'webrtc/webrtcvideoframefactory.cc',
-        'webrtc/webrtcvideoframefactory.h',
-        'webrtc/webrtcvoe.h',
-        'webrtc/webrtcvoiceengine.cc',
-        'webrtc/webrtcvoiceengine.h',
       ],
       # TODO(kjellander): Make the code compile without disabling these flags.
       # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307

webrtc/media/media_tests.gypi

@@ -53,14 +53,14 @@
         'base/testutils.cc',
         'base/testutils.h',
         'devices/fakedevicemanager.h',
-        'webrtc/fakewebrtccall.cc',
+        'engine/fakewebrtccall.cc',
-        'webrtc/fakewebrtccall.h',
+        'engine/fakewebrtccall.h',
-        'webrtc/fakewebrtccommon.h',
+        'engine/fakewebrtccommon.h',
-        'webrtc/fakewebrtcdeviceinfo.h',
+        'engine/fakewebrtcdeviceinfo.h',
-        'webrtc/fakewebrtcvcmfactory.h',
+        'engine/fakewebrtcvcmfactory.h',
-        'webrtc/fakewebrtcvideocapturemodule.h',
+        'engine/fakewebrtcvideocapturemodule.h',
-        'webrtc/fakewebrtcvideoengine.h',
+        'engine/fakewebrtcvideoengine.h',
-        'webrtc/fakewebrtcvoiceengine.h',
+        'engine/fakewebrtcvoiceengine.h',
       ],
       # TODO(kjellander): Make the code compile without disabling these flags.
       # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307
@@ -90,18 +90,18 @@
         'base/videoengine_unittest.h',
         'base/videoframe_unittest.h',
         'devices/dummydevicemanager_unittest.cc',
-        'sctp/sctpdataengine_unittest.cc',
+        'engine/nullwebrtcvideoengine_unittest.cc',
-        'webrtc/nullwebrtcvideoengine_unittest.cc',
+        'engine/simulcast_unittest.cc',
-        'webrtc/simulcast_unittest.cc',
+        'engine/webrtcmediaengine_unittest.cc',
-        'webrtc/webrtcmediaengine_unittest.cc',
+        'engine/webrtcvideocapturer_unittest.cc',
-        'webrtc/webrtcvideocapturer_unittest.cc',
+        'engine/webrtcvideoframe_unittest.cc',
-        'webrtc/webrtcvideoframe_unittest.cc',
+        'engine/webrtcvideoframefactory_unittest.cc',
-        'webrtc/webrtcvideoframefactory_unittest.cc',
         # Disabled because some tests fail.
         # TODO(ronghuawu): Reenable these tests.
         # 'devices/devicemanager_unittest.cc',
-        'webrtc/webrtcvideoengine2_unittest.cc',
+        'engine/webrtcvideoengine2_unittest.cc',
-        'webrtc/webrtcvoiceengine_unittest.cc',
+        'engine/webrtcvoiceengine_unittest.cc',
+        'sctp/sctpdataengine_unittest.cc',
       ],
       # TODO(kjellander): Make the code compile without disabling these flags.
       # See https://bugs.chromium.org/p/webrtc/issues/detail?id=3307