Rename webrtc/media/webrtc -> webrtc/media/engine

webrtc/media/media_tests.gypi

Index: webrtc/media/media_tests.gypi
diff --git a/webrtc/media/media_tests.gypi b/webrtc/media/media_tests.gypi
index 4d03068fa2f704e6d71b89426eb4f3e439cb7042..49131c5aa267bed1ac746778ee46f1e194903001 100644
--- a/webrtc/media/media_tests.gypi
+++ b/webrtc/media/media_tests.gypi
@@ -53,14 +53,14 @@
         'base/testutils.cc',
         'base/testutils.h',
         'devices/fakedevicemanager.h',
-        'webrtc/fakewebrtccall.cc',
-        'webrtc/fakewebrtccall.h',
-        'webrtc/fakewebrtccommon.h',
-        'webrtc/fakewebrtcdeviceinfo.h',
-        'webrtc/fakewebrtcvcmfactory.h',
-        'webrtc/fakewebrtcvideocapturemodule.h',
-        'webrtc/fakewebrtcvideoengine.h',
-        'webrtc/fakewebrtcvoiceengine.h',
+        'engine/fakewebrtccall.cc',
+        'engine/fakewebrtccall.h',
+        'engine/fakewebrtccommon.h',
+        'engine/fakewebrtcdeviceinfo.h',
+        'engine/fakewebrtcvcmfactory.h',
+        'engine/fakewebrtcvideocapturemodule.h',
+        'engine/fakewebrtcvideoengine.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',
-        'webrtc/nullwebrtcvideoengine_unittest.cc',
-        'webrtc/simulcast_unittest.cc',
-        'webrtc/webrtcmediaengine_unittest.cc',
-        'webrtc/webrtcvideocapturer_unittest.cc',
-        'webrtc/webrtcvideoframe_unittest.cc',
-        'webrtc/webrtcvideoframefactory_unittest.cc',
+        'engine/nullwebrtcvideoengine_unittest.cc',
+        'engine/simulcast_unittest.cc',
+        'engine/webrtcmediaengine_unittest.cc',
+        'engine/webrtcvideocapturer_unittest.cc',
+        'engine/webrtcvideoframe_unittest.cc',
+        'engine/webrtcvideoframefactory_unittest.cc',
         # Disabled because some tests fail.
         # TODO(ronghuawu): Reenable these tests.
         # 'devices/devicemanager_unittest.cc',
-        'webrtc/webrtcvideoengine2_unittest.cc',
-        'webrtc/webrtcvoiceengine_unittest.cc',
+        'engine/webrtcvideoengine2_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