diff options
Diffstat (limited to 'chromium/chromecast')
-rw-r--r-- | chromium/chromecast/BUILD.gn | 64 | ||||
-rw-r--r-- | chromium/chromecast/browser/BUILD.gn | 49 | ||||
-rw-r--r-- | chromium/chromecast/browser/android/BUILD.gn | 6 | ||||
-rw-r--r-- | chromium/chromecast/browser/general_audience_browsing/mojom/BUILD.gn | 11 | ||||
-rw-r--r-- | chromium/chromecast/browser/general_audience_browsing/mojom/general_audience_browsing.mojom | 14 | ||||
-rw-r--r-- | chromium/chromecast/browser/metrics/BUILD.gn | 11 | ||||
-rw-r--r-- | chromium/chromecast/chromecast.gni | 8 | ||||
-rw-r--r-- | chromium/chromecast/common/BUILD.gn | 8 | ||||
-rw-r--r-- | chromium/chromecast/graphics/BUILD.gn | 2 | ||||
-rw-r--r-- | chromium/chromecast/media/audio/BUILD.gn | 5 | ||||
-rw-r--r-- | chromium/chromecast/media/base/BUILD.gn | 4 | ||||
-rw-r--r-- | chromium/chromecast/media/cma/backend/BUILD.gn | 23 | ||||
-rw-r--r-- | chromium/chromecast/media/cma/backend/android/BUILD.gn | 4 | ||||
-rw-r--r-- | chromium/chromecast/public/BUILD.gn | 2 | ||||
-rw-r--r-- | chromium/chromecast/renderer/BUILD.gn | 3 | ||||
-rw-r--r-- | chromium/chromecast/utility/BUILD.gn | 11 |
16 files changed, 145 insertions, 80 deletions
diff --git a/chromium/chromecast/BUILD.gn b/chromium/chromecast/BUILD.gn index e9986487ee4..b579c227fc1 100644 --- a/chromium/chromecast/BUILD.gn +++ b/chromium/chromecast/BUILD.gn @@ -19,6 +19,7 @@ if (is_android) { declare_args() { cast_test_extra_flags = "" + vendor_cast_media_gtest_excludes = [] } # Depends on all non-test targets that should be built by the Chromecast @@ -94,16 +95,23 @@ cast_test_group("cast_tests") { } if (is_linux || is_fuchsia) { - tests += [ - "//chromecast/media/cma/backend:cast_audio_backend_unittests", - "//chromecast/media/cma/backend:cast_av_sync_backend_unittests", - ] + tests += [ "//chromecast/media/cma/backend:cast_audio_backend_unittests" ] } if (is_android && is_cast_using_cma_backend) { tests += [ "//chromecast/media/cma/backend/android:cast_android_cma_backend_unittests" ] } + cast_media_unittests_filter = { + test_name = "cast_media_unittests" + + gtest_excludes = vendor_cast_media_gtest_excludes + + # --test-launcher-jobs=1 => so internal code can bind to port + args = [ "--test-launcher-jobs=1" ] + } + filters += [ cast_media_unittests_filter ] + if (!is_android) { tests += [ ":cast_shell_browsertests", @@ -116,18 +124,6 @@ cast_test_group("cast_tests") { tests += [ "//jingle:jingle_unittests" ] } - cast_media_unittests_filter = { - test_name = "cast_media_unittests" - - # TODO(almasrymina) : Track this test as a separate bug - # (internal : b/115400220) - gtest_excludes = [ "AudioVideoPipelineDeviceTest.Mp4Playback" ] - - # --test-launcher-jobs=1 => so internal code can bind to port - args = [ "--test-launcher-jobs=1" ] - } - filters += [ cast_media_unittests_filter ] - cast_shell_browsertests_filter = { test_name = "cast_shell_browsertests" @@ -219,7 +215,7 @@ cast_test_group("cast_tests") { "ProcessUtilTest.*", "StackContainer.BufferAlignment", "SystemMetrics2Test.GetSystemMemoryInfo", - "OneTraitsExecutionModePair/TaskSchedulerImplTest.PostTasksViaTaskRunner/*", + "OneTraitsExecutionModePair/ThreadPoolImplTest.PostTasksViaTaskRunner/*", "TaskSchedulerWorkerTest.WorkerDetaches", ] } @@ -233,6 +229,19 @@ cast_test_group("cast_tests") { } filters += [ base_unittests_filter ] + cast_avsettings_unittests_filter = { + test_name = "cast_avsettings_unittests" + gtest_excludes = [] + if (is_android_things) { + # Disable tests to enable presubmit. Re-enable for b/120669054. + gtest_excludes += [ + "JniVolumeControllerTest.SetMutedNotifiesAllVolumeObservers", + "JniVolumeControllerTest.SetVolumeNotifiesVolumeObserver", + ] + } + } + filters += [ cast_avsettings_unittests_filter ] + cc_unittests_filter = { test_name = "cc_unittests" @@ -260,8 +269,10 @@ cast_test_group("cast_tests") { # (b/36984215). gtest_excludes = [ "*.IsSupportedVideoConfig_VP9TransferFunctions" ] if (is_android_things) { - gtest_excludes += - [ "FontUniqueNameLookupTest.TestMatchPostScriptNameTtc" ] + gtest_excludes += [ + "FontUniqueNameLookupTest.TestMatchPostScriptNameTtc", + "SiteInstanceTest.HasWrongProcessForURL", + ] } if (target_os == "linux" && !is_cast_desktop_build) { # DesktopCaptureDeviceTest.*: No capture device on Eureka @@ -368,6 +379,16 @@ cast_test_group("cast_tests") { } } filters += [ net_unittests_filter ] + + cast_receiver_unittests_filter = { + test_name = "cast_receiver_unittests" + gtest_excludes = [] + if (is_android_things) { + # Disable tests to enable presubmit. Re-enable for b/120669054. + gtest_excludes += [ "ApplicationManagerImplTest.SwapBackgroundApp_StereoVirtualDevice_BitstreamNotSupported" ] + } + } + filters += [ cast_receiver_unittests_filter ] } # Creates the build and run lists for all test targets. @@ -568,9 +589,9 @@ foreach(locale, cast_locales) { # A meta-target which repacks resources by locale. group("chromecast_locales_pak") { - deps = [] + data_deps = [] foreach(locale, cast_locales) { - deps += [ ":_cast_repack_${locale}" ] + data_deps += [ ":_cast_repack_${locale}" ] } } @@ -658,5 +679,6 @@ if (is_android) { loadable_modules = [ "$root_out_dir/libcrashpad_handler.so" ] command_line_flags_file = "castshell-command-line" + enable_multidex = true } } diff --git a/chromium/chromecast/browser/BUILD.gn b/chromium/chromecast/browser/BUILD.gn index f777f46479b..ae7f13b7769 100644 --- a/chromium/chromecast/browser/BUILD.gn +++ b/chromium/chromecast/browser/BUILD.gn @@ -44,8 +44,8 @@ cast_source_set("browser") { sources = [ "application_media_capabilities.cc", "application_media_capabilities.h", - "application_session_id_manager.cc", - "application_session_id_manager.h", + "application_media_info_manager.cc", + "application_media_info_manager.h", "bluetooth/cast_bluetooth_chooser.cc", "bluetooth/cast_bluetooth_chooser.h", "cast_browser_context.cc", @@ -100,18 +100,16 @@ cast_source_set("browser") { "devtools/cast_devtools_manager_delegate.h", "devtools/remote_debugging_server.cc", "devtools/remote_debugging_server.h", + "general_audience_browsing_navigation_throttle.cc", + "general_audience_browsing_navigation_throttle.h", + "general_audience_browsing_service.cc", + "general_audience_browsing_service.h", "lru_renderer_cache.cc", "lru_renderer_cache.h", "media/media_caps_impl.cc", "media/media_caps_impl.h", "media/supported_codec_finder.cc", "media/supported_codec_finder.h", - "metrics/cast_metrics_prefs.cc", - "metrics/cast_metrics_prefs.h", - "metrics/cast_metrics_service_client.cc", - "metrics/cast_metrics_service_client.h", - "metrics/cast_stability_metrics_provider.cc", - "metrics/cast_stability_metrics_provider.h", "renderer_prelauncher.cc", "renderer_prelauncher.h", "service/cast_service_simple.cc", @@ -138,6 +136,7 @@ cast_source_set("browser") { public_deps = [ ":prefs", ":public", + "//chromecast/browser/metrics", ] deps = [ @@ -153,6 +152,7 @@ cast_source_set("browser") { "//chromecast/base:cast_sys_info", "//chromecast/base:cast_version", "//chromecast/browser/bluetooth/public/mojom", + "//chromecast/browser/general_audience_browsing/mojom", "//chromecast/common", "//chromecast/common/media", "//chromecast/common/mojom", @@ -167,14 +167,18 @@ cast_source_set("browser") { "//components/metrics", "//components/metrics:gpu", "//components/metrics:net", + "//components/variations/net", # TODO(gfhuang): Eliminate this dependency if ScreenInfoMetricsProvider # isn't needed. crbug.com/541577 "//components/metrics:ui", "//components/network_hints/browser", "//components/network_session_configurator/common", + "//components/policy/core/browser", "//components/prefs", "//components/proxy_config", + "//components/safe_search_api", + "//components/safe_search_api:safe_search_client", "//components/viz/service", "//content/public/browser", "//content/public/common", @@ -226,14 +230,9 @@ cast_source_set("browser") { "cast_memory_pressure_monitor.h", "memory_pressure_controller_impl.cc", "memory_pressure_controller_impl.h", - "metrics/external_metrics.cc", - "metrics/external_metrics.h", ] - deps += [ - "//components/metrics:serialization", - "//third_party/fontconfig", - ] + deps += [ "//third_party/fontconfig" ] } if (use_aura) { @@ -249,6 +248,15 @@ cast_source_set("browser") { "//components/crash/content/app", "//components/crash/content/browser", ] + + # TODO(crbug.com/933142): Fuchsia needs its own methods to bridge with heap + # profiling service + deps += [ + "//components/heap_profiling", + "//components/services/heap_profiling", + "//components/services/heap_profiling/public/cpp", + "//components/services/heap_profiling/public/mojom", + ] } if (use_ozone) { @@ -274,8 +282,8 @@ cast_source_set("browser") { "cast_extension_message_filter.h", "cast_extension_url_loader_factory.cc", "cast_extension_url_loader_factory.h", - "cast_web_view_extension.cc", - "cast_web_view_extension.h", + "extension_page.cc", + "extension_page.h", "extension_request_protocol_handler.cc", "extension_request_protocol_handler.h", "extensions/api/accessibility_private/accessibility_extension_api.cc", @@ -338,8 +346,6 @@ cast_source_set("browser") { "accessibility/touch_exploration_controller.h", "accessibility/touch_exploration_manager.cc", "accessibility/touch_exploration_manager.h", - "cast_web_view_extension.h", - "cast_web_view_extension.h", "ui/aura/accessibility/automation_manager_aura.cc", "ui/aura/accessibility/automation_manager_aura.h", "ui/aura/accessibility/ax_tree_source_aura.cc", @@ -402,6 +408,7 @@ cast_source_set("network_context_manager") { deps = [ "//base", + "//components/variations/net", "//content/public/browser", "//net", "//services/network:network_service", @@ -462,6 +469,7 @@ cast_source_set("browsertests") { sources = [ "cast_content_gesture_handler_test.cc", "cast_media_blocker_browsertest.cc", + "cast_web_contents_browsertest.cc", "renderer_prelauncher_test.cc", "test/cast_features_browsertest.cc", "test/cast_navigation_browsertest.cc", @@ -471,15 +479,20 @@ cast_source_set("browsertests") { deps = [ ":test_support", + "//base", "//chromecast:chromecast_buildflags", "//chromecast/base", "//chromecast/base:chromecast_switches", "//chromecast/base/metrics", "//components/prefs", + "//content/public/browser", + "//content/test:test_support", "//media:test_support", + "//net:test_support", ] data = [ + "//chromecast/browser/test/data/", "//media/test/data/", ] } diff --git a/chromium/chromecast/browser/android/BUILD.gn b/chromium/chromecast/browser/android/BUILD.gn index 93952de7f60..05bb46fddfc 100644 --- a/chromium/chromecast/browser/android/BUILD.gn +++ b/chromium/chromecast/browser/android/BUILD.gn @@ -93,7 +93,7 @@ android_library("reactive_android_java") { deps = [ "//base:base_java", "//chromecast/base:base_java", - "//third_party/android_deps:android_support_core_utils_java", + "//third_party/android_deps:com_android_support_support_core_utils_java", ] } @@ -149,7 +149,7 @@ android_library("cast_shell_java") { "//net/android:net_java", # TODO(slan): We may need to pass this in as a parameter. - "//third_party/android_deps:android_support_core_utils_java", + "//third_party/android_deps:com_android_support_support_core_utils_java", "//ui/android:ui_java", ] @@ -210,7 +210,7 @@ junit_binary("cast_shell_junit_tests") { "//base:base_junit_test_support", "//chromecast/base:cast_base_test_utils_java", "//content/public/android:content_java", - "//third_party/android_deps:android_support_core_utils_java", + "//third_party/android_deps:com_android_support_support_core_utils_java", "//third_party/hamcrest:hamcrest_java", ] } diff --git a/chromium/chromecast/browser/general_audience_browsing/mojom/BUILD.gn b/chromium/chromecast/browser/general_audience_browsing/mojom/BUILD.gn new file mode 100644 index 00000000000..740525b3cbb --- /dev/null +++ b/chromium/chromecast/browser/general_audience_browsing/mojom/BUILD.gn @@ -0,0 +1,11 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//mojo/public/tools/bindings/mojom.gni") + +mojom("mojom") { + sources = [ + "general_audience_browsing.mojom", + ] +} diff --git a/chromium/chromecast/browser/general_audience_browsing/mojom/general_audience_browsing.mojom b/chromium/chromecast/browser/general_audience_browsing/mojom/general_audience_browsing.mojom new file mode 100644 index 00000000000..2f288577f7e --- /dev/null +++ b/chromium/chromecast/browser/general_audience_browsing/mojom/general_audience_browsing.mojom @@ -0,0 +1,14 @@ +// Copyright 2019 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +module chromecast.mojom; + +interface GeneralAudienceBrowsingAPIKeyObserver { + OnGeneralAudienceBrowsingAPIKeyChanged(string api_key); +}; + +interface GeneralAudienceBrowsingAPIKeySubject { + AddGeneralAudienceBrowsingAPIKeyObserver( + GeneralAudienceBrowsingAPIKeyObserver observer); +}; diff --git a/chromium/chromecast/browser/metrics/BUILD.gn b/chromium/chromecast/browser/metrics/BUILD.gn index 9e037513cfd..1055295a310 100644 --- a/chromium/chromecast/browser/metrics/BUILD.gn +++ b/chromium/chromecast/browser/metrics/BUILD.gn @@ -18,13 +18,17 @@ cast_source_set("metrics") { "//base", "//base:i18n", "//chromecast/base", - "//chromecast/common", + "//chromecast/base:cast_sys_info", + "//chromecast/base:cast_version", "//components/metrics", "//components/metrics:gpu", "//components/metrics:net", + "//components/metrics:ui", "//components/prefs", "//content/public/browser", "//content/public/common", + "//services/network/public/cpp", + "//third_party/metrics_proto", ] if (is_linux) { @@ -33,6 +37,9 @@ cast_source_set("metrics") { "external_metrics.h", ] - deps += [ "//components/metrics:serialization" ] + deps += [ + "//chromecast/base/metrics", + "//components/metrics:serialization", + ] } } diff --git a/chromium/chromecast/chromecast.gni b/chromium/chromecast/chromecast.gni index e9c0aba9a97..f82aea23079 100644 --- a/chromium/chromecast/chromecast.gni +++ b/chromium/chromecast/chromecast.gni @@ -17,11 +17,6 @@ declare_args() { # when the default value is used. cast_build_incremental = "999999" - # If true, IS_CAST_DEBUG_BUILD() will evaluate to 1 in version.h. Otherwise, - # it will evaluate to 0. Overriding this when is_debug=false is useful for - # doing engineering builds. - cast_is_debug = is_debug - if (is_android) { # If true, run receiver apps in an Android service instead of an activity. display_web_contents_in_service = is_cast_audio_only @@ -121,6 +116,9 @@ declare_args() { # within cast_shell. Enable for desktop builds to ensure that Chromium CQ # builds the external Mojo broker code. enable_external_mojo_services = is_cast_desktop_build + + # Recording happens at this sample rate. Must be 16000, 48000 or 96000 Hz. + audio_input_sample_rate = 16000 } declare_args() { diff --git a/chromium/chromecast/common/BUILD.gn b/chromium/chromecast/common/BUILD.gn index dac6096cc84..71ea0bb71c5 100644 --- a/chromium/chromecast/common/BUILD.gn +++ b/chromium/chromecast/common/BUILD.gn @@ -11,6 +11,8 @@ cast_source_set("common") { "cast_content_client.h", "cast_resource_delegate.cc", "cast_resource_delegate.h", + "cast_url_loader_throttle.cc", + "cast_url_loader_throttle.h", "global_descriptors.h", ] @@ -21,6 +23,8 @@ cast_source_set("common") { "//chromecast/base:cast_version", "//chromecast/common/media", "//content/public/common", + "//net", + "//services/network/public/cpp:cpp", "//ui/base", "//ui/gfx", "//url:url", @@ -52,4 +56,8 @@ cast_source_set("common") { "//extensions/shell:resources_grit", ] } + + if (!is_fuchsia) { + deps += [ "//components/services/heap_profiling/public/cpp" ] + } } diff --git a/chromium/chromecast/graphics/BUILD.gn b/chromium/chromecast/graphics/BUILD.gn index a884b3abc24..d77c0715990 100644 --- a/chromium/chromecast/graphics/BUILD.gn +++ b/chromium/chromecast/graphics/BUILD.gn @@ -62,7 +62,7 @@ cast_source_set("graphics") { ] deps += [ - "//ui/base/ime", + "//ui/base/ime/init", "//ui/events:gesture_detection", "//ui/views", "//ui/wm", diff --git a/chromium/chromecast/media/audio/BUILD.gn b/chromium/chromecast/media/audio/BUILD.gn index efa3ccc7ab7..2e000eb20ae 100644 --- a/chromium/chromecast/media/audio/BUILD.gn +++ b/chromium/chromecast/media/audio/BUILD.gn @@ -80,4 +80,9 @@ buildflag_header("audio_buildflags") { "MAXIMUM_OUTPUT_BUFFER_SIZE_IN_FRAMES=$maximum_output_buffer_size_in_frames", "DEFAULT_OUTPUT_BUFFER_SIZE_IN_FRAMES=$default_output_buffer_size_in_frames", ] + + if (use_alsa) { + # Currently, this flag will only be used in cast_audio_manager_alsa.cc + flags += [ "AUDIO_INPUT_SAMPLE_RATE=$audio_input_sample_rate" ] + } } diff --git a/chromium/chromecast/media/base/BUILD.gn b/chromium/chromecast/media/base/BUILD.gn index 2b3982397ea..4b7eea964fe 100644 --- a/chromium/chromecast/media/base/BUILD.gn +++ b/chromium/chromecast/media/base/BUILD.gn @@ -31,8 +31,6 @@ cast_source_set("base") { "audio_device_ids.h", "decrypt_context_impl.cc", "decrypt_context_impl.h", - "decrypt_context_impl_clearkey.cc", - "decrypt_context_impl_clearkey.h", "media_caps.cc", "media_caps.h", "slew_volume.cc", @@ -59,8 +57,6 @@ cast_source_set("base") { deps = [ "//base", "//chromecast/base", - "//crypto", - "//crypto:platform", "//media", "//media:shared_memory_support", "//ui/gfx/geometry", diff --git a/chromium/chromecast/media/cma/backend/BUILD.gn b/chromium/chromecast/media/cma/backend/BUILD.gn index f433faeadc8..479e8fd05f1 100644 --- a/chromium/chromecast/media/cma/backend/BUILD.gn +++ b/chromium/chromecast/media/cma/backend/BUILD.gn @@ -336,26 +336,3 @@ test("cast_audio_backend_unittests") { deps += [ "fuchsia:unit_tests" ] } } - -test("cast_av_sync_backend_unittests") { - testonly = true - sources = [ - "av_sync_unittest.cc", - "mock_audio_decoder_for_mixer.cc", - "mock_audio_decoder_for_mixer.h", - "mock_video_decoder_for_mixer.cc", - "mock_video_decoder_for_mixer.h", - ] - - deps = [ - ":for_mixer_audio", - "//base", - "//base/test:run_all_unittests", - "//base/test:test_support", - "//chromecast/base", - "//chromecast/media/cma/backend/video:av_sync_video", - "//chromecast/public/media", - "//testing/gmock", - "//testing/gtest", - ] -} diff --git a/chromium/chromecast/media/cma/backend/android/BUILD.gn b/chromium/chromecast/media/cma/backend/android/BUILD.gn index 96e8ead8f40..b05a52da8d6 100644 --- a/chromium/chromecast/media/cma/backend/android/BUILD.gn +++ b/chromium/chromecast/media/cma/backend/android/BUILD.gn @@ -73,8 +73,8 @@ android_library("audio_track_java") { "//base:base_java", "//chromecast/base:base_java", "//chromecast/public:volume_control_enums_java", - "//third_party/android_deps:android_support_annotations_java", - "//third_party/android_deps:android_support_v13_java", + "//third_party/android_deps:com_android_support_support_annotations_java", + "//third_party/android_deps:com_android_support_support_v13_java", ] } diff --git a/chromium/chromecast/public/BUILD.gn b/chromium/chromecast/public/BUILD.gn index 99730d04409..d14f84d36df 100644 --- a/chromium/chromecast/public/BUILD.gn +++ b/chromium/chromecast/public/BUILD.gn @@ -50,7 +50,7 @@ if (is_android) { android_library("volume_control_enums_java") { srcjar_deps = [ ":java_enums_volume_control" ] deps = [ - "//third_party/android_deps:android_support_annotations_java", + "//third_party/android_deps:com_android_support_support_annotations_java", ] } } diff --git a/chromium/chromecast/renderer/BUILD.gn b/chromium/chromecast/renderer/BUILD.gn index 3678bd234bb..ba2c942b5ad 100644 --- a/chromium/chromecast/renderer/BUILD.gn +++ b/chromium/chromecast/renderer/BUILD.gn @@ -30,6 +30,8 @@ cast_source_set("renderer") { "cast_content_renderer_client.h", "cast_media_playback_options.cc", "cast_media_playback_options.h", + "cast_url_loader_throttle_provider.cc", + "cast_url_loader_throttle_provider.h", ] public_deps = [ @@ -54,6 +56,7 @@ cast_source_set("renderer") { "//crypto", "//ipc", "//media", + "//services/network/public/cpp:cpp", "//services/service_manager/public/cpp", ] diff --git a/chromium/chromecast/utility/BUILD.gn b/chromium/chromecast/utility/BUILD.gn index a9e293816da..421cd0e48b4 100644 --- a/chromium/chromecast/utility/BUILD.gn +++ b/chromium/chromecast/utility/BUILD.gn @@ -17,4 +17,15 @@ cast_source_set("utility") { if (chromecast_branding == "public") { sources += [ "cast_content_utility_client_simple.cc" ] } + + if (!is_fuchsia) { + sources += [ "cast_content_utility_client.cc" ] + + deps += [ + "//chromecast:chromecast_buildflags", + "//components/services/heap_profiling", + "//components/services/heap_profiling/public/mojom", + "//services/service_manager/public/cpp", + ] + } } |