Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2259)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/media.gyp

Issue 1188753002: media: Fix mojo pipeline integration tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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 | « media/base/null_video_sink.cc ('k') | media/mojo/services/mojo_renderer_service.cc » ('j') | media/mojo/services/renderer_config_default.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 0f90a57ba4386ae733719d092a2197c84721bbe2..7b3869bb7c1ef01ff66b367feffd33f027d9d9b6 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -330,6 +330,8 @@
'base/moving_average.h',
'base/multi_channel_resampler.cc',
'base/multi_channel_resampler.h',
+ 'base/null_video_sink.cc',
DaleCurtis 2015/06/16 16:24:44 Why the move back? Do the mojo tests not use test_
xhwang 2015/06/16 17:16:57 This is used by DefaultRendererConfig, which is pa
+ 'base/null_video_sink.h',
'base/pipeline.cc',
'base/pipeline.h',
'base/pipeline_status.h',
@@ -1507,8 +1509,6 @@
'base/mock_demuxer_host.h',
'base/mock_filters.cc',
'base/mock_filters.h',
- 'base/null_video_sink.cc',
- 'base/null_video_sink.h',
'base/test_data_util.cc',
'base/test_data_util.h',
'base/test_helpers.cc',
« no previous file with comments | « media/base/null_video_sink.cc ('k') | media/mojo/services/mojo_renderer_service.cc » ('j') | media/mojo/services/renderer_config_default.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698