Merge webrtc/video_engine/ into webrtc/video/

webrtc/webrtc_tests.gypi

Index: webrtc/webrtc_tests.gypi
diff --git a/webrtc/webrtc_tests.gypi b/webrtc/webrtc_tests.gypi
index 4b8a6d9af1297242e5e77cc471a99b75b69dd482..238778bf1026a6bc4c0af1d3452d5bf51992e323 100644
--- a/webrtc/webrtc_tests.gypi
+++ b/webrtc/webrtc_tests.gypi
@@ -160,20 +160,20 @@
         'call/packet_injection_tests.cc',
         'test/common_unittest.cc',
         'test/testsupport/metrics/video_metrics_unittest.cc',
+        'video/call_stats_unittest.cc',
+        'video/encoder_state_feedback_unittest.cc',
         'video/end_to_end_tests.cc',
+        'video/overuse_frame_detector_unittest.cc',
+        'video/payload_router_unittest.cc',
+        'video/report_block_stats_unittest.cc',
         'video/send_statistics_proxy_unittest.cc',
+        'video/stream_synchronization_unittest.cc',
         'video/video_capture_input_unittest.cc',
         'video/video_decoder_unittest.cc',
         'video/video_encoder_unittest.cc',
         'video/video_send_stream_tests.cc',
-        'video_engine/call_stats_unittest.cc',
-        'video_engine/encoder_state_feedback_unittest.cc',
-        'video_engine/overuse_frame_detector_unittest.cc',
-        'video_engine/payload_router_unittest.cc',
-        'video_engine/report_block_stats_unittest.cc',
-        'video_engine/stream_synchronization_unittest.cc',
-        'video_engine/vie_codec_unittest.cc',
-        'video_engine/vie_remb_unittest.cc',
+        'video/vie_codec_unittest.cc',
+        'video/vie_remb_unittest.cc',
       ],
       'dependencies': [
         '<(DEPTH)/testing/gmock.gyp:gmock',