content/content_tests.gypi - Issue 8060055: Adding support for MediaStream and PeerConnection functionality

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/content_tests.gypi

Issue 8060055: Adding support for MediaStream and PeerConnection functionality (Closed) Base URL: http://git.chromium.org/chromium/chromium.git@trunk

Patch Set: Code review, adding changed gyp files. It also includes all changes in patch 4 which didn't get in. Created 9 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/content_renderer.gypi ('k') | content/renderer/media/media_stream_dependency_factory.h » ('j') | content/renderer/media/mock_media_stream_dispatcher.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/content_tests.gypi

diff --git a/content/content_tests.gypi b/content/content_tests.gypi

index d0238e4d9b185fccc83f82f86541f92cf56d2cba..00f8319c6feed9c32b26ba025ab4e795c2102fbc 100644

--- a/content/content_tests.gypi

+++ b/content/content_tests.gypi

@@ -14,6 +14,9 @@

'../skia/skia.gyp:skia',

'../testing/gmock.gyp:gmock',

'../testing/gtest.gyp:gtest',

+ '../third_party/libjingle/libjingle.gyp:libjingle',

+ '../third_party/webrtc/video_engine/video_engine.gyp:video_engine_core',

+ '../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core',

'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',

'../ui/gfx/compositor/compositor.gyp:test_compositor',

'../ui/gfx/surface/surface.gyp:surface',

@@ -54,6 +57,12 @@

'common/test_url_constants.h',

'gpu/gpu_idirect3d9_mock_win.cc',

'gpu/gpu_idirect3d9_mock_win.h',

+ 'renderer/media/mock_media_stream_dependency_factory.cc',

+ 'renderer/media/mock_media_stream_dependency_factory.h',

+ 'renderer/media/mock_media_stream_dispatcher.cc',

+ 'renderer/media/mock_media_stream_dispatcher.h',

+ 'renderer/media/mock_peer_connection_impl.cc',

+ 'renderer/media/mock_peer_connection_impl.h',

'renderer/mock_content_renderer_client.cc',

'renderer/mock_content_renderer_client.h',

'test/browser_test.h',

@@ -198,6 +207,7 @@

'renderer/media/audio_renderer_impl_unittest.cc',

'renderer/media/capture_video_decoder_unittest.cc',

'renderer/media/media_stream_dispatcher_unittest.cc',

+ 'renderer/media/media_stream_impl_unittest.cc',

'renderer/media/rtc_video_decoder_unittest.cc',

'renderer/media/video_capture_impl_unittest.cc',

'renderer/media/video_capture_message_filter_unittest.cc',