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

Side by Side Diff: media/media.gyp

Issue 10704154: Small refactor to media architecture in order to allow end-to-end tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moved MockAudioManager under media/, inherting from AudioManager, removing static field from AudioM… Created 8 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # Override to dynamically link the PulseAudio library. 8 # Override to dynamically link the PulseAudio library.
9 'use_pulseaudio%': 0, 9 'use_pulseaudio%': 0,
10 # Override to dynamically link the cras (ChromeOS audio) library. 10 # Override to dynamically link the cras (ChromeOS audio) library.
(...skipping 771 matching lines...) Expand 10 before | Expand all | Expand 10 after
782 { 782 {
783 'target_name': 'media_test_support', 783 'target_name': 'media_test_support',
784 'type': 'static_library', 784 'type': 'static_library',
785 'dependencies': [ 785 'dependencies': [
786 'media', 786 'media',
787 '../base/base.gyp:base', 787 '../base/base.gyp:base',
788 '../testing/gmock.gyp:gmock', 788 '../testing/gmock.gyp:gmock',
789 '../testing/gtest.gyp:gtest', 789 '../testing/gtest.gyp:gtest',
790 ], 790 ],
791 'sources': [ 791 'sources': [
792 'audio/mock_audio_manager.cc',
793 'audio/mock_audio_manager.h',
792 'audio/test_audio_input_controller_factory.cc', 794 'audio/test_audio_input_controller_factory.cc',
793 'audio/test_audio_input_controller_factory.h', 795 'audio/test_audio_input_controller_factory.h',
794 'base/mock_callback.cc', 796 'base/mock_callback.cc',
795 'base/mock_callback.h', 797 'base/mock_callback.h',
796 'base/mock_data_source_host.cc', 798 'base/mock_data_source_host.cc',
797 'base/mock_data_source_host.h', 799 'base/mock_data_source_host.h',
798 'base/mock_demuxer_host.cc', 800 'base/mock_demuxer_host.cc',
799 'base/mock_demuxer_host.h', 801 'base/mock_demuxer_host.h',
800 'base/mock_filter_host.cc', 802 'base/mock_filter_host.cc',
801 'base/mock_filter_host.h', 803 'base/mock_filter_host.h',
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
1105 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 1107 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
1106 ], 1108 ],
1107 'sources': [ 1109 'sources': [
1108 'tools/media_bench/media_bench.cc', 1110 'tools/media_bench/media_bench.cc',
1109 ], 1111 ],
1110 }, 1112 },
1111 ], 1113 ],
1112 }] 1114 }]
1113 ], 1115 ],
1114 } 1116 }
OLDNEW
« media/audio/mock_audio_manager.cc ('K') | « media/audio/test_audio_input_controller_factory.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698