content/content_tests.gypi - Issue 1698933004: Make MediaSession a runtime-enabled feature on Desktop.

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 1698933004: Make MediaSession a runtime-enabled feature on Desktop. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: review comments and windows build fix Created 4 years, 10 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

« content/browser/media/session/media_session.cc ('K') | « content/content_jni.gypi ('k') | content/public/android/java/src/org/chromium/content/browser/MediaSession.java » ('j') | no next file with comments »
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 43085aacbbc9659526b8b5dc61b878cc19ed6118..a008a1e25b1abaae0aed6a328d03bed85396f60a 100644

--- a/content/content_tests.gypi

+++ b/content/content_tests.gypi

@@ -232,12 +232,15 @@

'browser/loader/cross_site_resource_handler_browsertest.cc',

'browser/loader/resource_dispatcher_host_browsertest.cc',

'browser/manifest/manifest_browsertest.cc',

- 'browser/media/android/media_session_browsertest.cc',

'browser/media/encrypted_media_browsertest.cc',

'browser/media/media_browsertest.cc',

'browser/media/media_browsertest.h',

'browser/media/media_canplaytype_browsertest.cc',

'browser/media/media_source_browsertest.cc',

+ 'browser/media/session/media_session_browsertest.cc',

+ 'browser/media/session/media_session_delegate_default_browsertest.cc',

+ 'browser/media/session/mock_media_session_observer.cc',

+ 'browser/media/session/mock_media_session_observer.h',

'browser/memory/memory_pressure_controller_impl_browsertest.cc',

'browser/message_port_provider_browsertest.cc',

'browser/mojo_shell_browsertest.cc',

@@ -500,8 +503,6 @@

'browser/loader/temporary_file_stream_unittest.cc',

'browser/loader/upload_data_stream_builder_unittest.cc',

'browser/mach_broker_mac_unittest.cc',

- 'browser/media/android/media_session_controller_unittest.cc',

- 'browser/media/android/media_session_uma_helper_unittest.cc',

'browser/media/audible_metrics_unittest.cc',

'browser/media/audio_stream_monitor_unittest.cc',

'browser/media/capture/audio_mirroring_manager_unittest.cc',

@@ -510,6 +511,8 @@

'browser/media/capture/web_contents_video_capture_device_unittest.cc',

'browser/media/media_internals_unittest.cc',

'browser/media/midi_host_unittest.cc',

+ 'browser/media/session/media_session_controller_unittest.cc',

+ 'browser/media/session/media_session_uma_helper_unittest.cc',

'browser/media/webrtc/webrtc_identity_store_unittest.cc',

'browser/net/quota_policy_cookie_store_unittest.cc',

'browser/notification_service_impl_unittest.cc',

@@ -1582,6 +1585,7 @@

'sources': [ '<@(content_browsertests_android_sources)' ],

'sources!': [

'browser/battery_status/battery_monitor_impl_browsertest.cc',

+ 'browser/media/session/media_session_delegate_default_browsertest.cc',

'dependencies': [

'content_shell_jni_headers',