Merge metrics_unittests into video_engine_tests.

metrics_unittests will be removed as soon as trybots catch up with LKGR,
that way we don't have to break any tryjobs during.

BUG=1843
R=kjellander@webrtc.org, mflodman@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/5789004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5284 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/video_engine_tests.isolate

@@ -25,6 +25,7 @@
         ],
         'isolate_dependency_tracked': [
           '../DEPS',
+          '../resources/foreman_cif_short.yuv',
           '../testing/test_env.py',
           '<(PRODUCT_DIR)/video_engine_tests<(EXECUTABLE_SUFFIX)',
         ],

webrtc/webrtc_tests.gypi

@@ -36,12 +36,14 @@
         'video/call_tests.cc',
         'video/video_send_stream_tests.cc',
         'test/common_unittest.cc',
+        'test/testsupport/metrics/video_metrics_unittest.cc',
         'test/test_main.cc',
       ],
       'dependencies': [
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
         'modules/modules.gyp:rtp_rtcp',
+        'test/metrics.gyp:metrics',
         'test/webrtc_test_common.gyp:webrtc_test_common',
         'webrtc',
       ],