Commit f099852e authored by Xiaohan Wang's avatar Xiaohan Wang Committed by Commit Bot

media: Remove enable_test_mojo_media_client gn arg

It's currently set to false by default and there's no bot setting it.
It was used in manual testing but hasn't been used for a long time.
This CL removes this gn arg.

Bug: 1067786
Change-Id: Idf7c57898f335b10441eb32e1509b2bee25c5368
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2136310Reviewed-by: default avatarYuchen Liu <yucliu@chromium.org>
Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#756498}
parent a3284e68
...@@ -168,10 +168,6 @@ declare_args() { ...@@ -168,10 +168,6 @@ declare_args() {
(is_android || is_chromeos || is_mac || is_win || enable_library_cdms || (is_android || is_chromeos || is_mac || is_win || enable_library_cdms ||
(is_desktop_linux && use_vaapi) || is_chromecast) (is_desktop_linux && use_vaapi) || is_chromecast)
# Enable the TestMojoMediaClient to be used in mojo MediaService. This is for
# testing only and will override the default platform MojoMediaClient, if any.
enable_test_mojo_media_client = false
# When enabled, this feature allows developers to use a runtime flag to # When enabled, this feature allows developers to use a runtime flag to
# choose the implementation of the renderer that is used. On a build which # choose the implementation of the renderer that is used. On a build which
# enables the mojo renderer, if --disable-mojo-renderer is passed at start-up, # enables the mojo renderer, if --disable-mojo-renderer is passed at start-up,
......
...@@ -21,7 +21,6 @@ buildflag_header("buildflags") { ...@@ -21,7 +21,6 @@ buildflag_header("buildflags") {
if (!enable_mojo_media) { if (!enable_mojo_media) {
assert(mojo_media_services == [], "Mojo media is not enabled") assert(mojo_media_services == [], "Mojo media is not enabled")
assert(mojo_media_host == "none", "Mojo media is not enabled") assert(mojo_media_host == "none", "Mojo media is not enabled")
assert(!enable_test_mojo_media_client, "Mojo media is not enabled")
} else { } else {
assert(mojo_media_services != [], "No mojo media service specified") assert(mojo_media_services != [], "No mojo media service specified")
foreach(service, mojo_media_services) { foreach(service, mojo_media_services) {
...@@ -52,7 +51,6 @@ buildflag_header("buildflags") { ...@@ -52,7 +51,6 @@ buildflag_header("buildflags") {
flags = [ flags = [
"ENABLE_CAST_RENDERER=$enable_cast_renderer", "ENABLE_CAST_RENDERER=$enable_cast_renderer",
"ENABLE_MOJO_MEDIA=$enable_mojo_media", "ENABLE_MOJO_MEDIA=$enable_mojo_media",
"ENABLE_TEST_MOJO_MEDIA_CLIENT=$enable_test_mojo_media_client",
"ENABLE_MOJO_RENDERER=$enable_mojo_renderer", "ENABLE_MOJO_RENDERER=$enable_mojo_renderer",
"ENABLE_MOJO_CDM=$enable_mojo_cdm", "ENABLE_MOJO_CDM=$enable_mojo_cdm",
"ENABLE_MOJO_AUDIO_DECODER=$enable_mojo_audio_decoder", "ENABLE_MOJO_AUDIO_DECODER=$enable_mojo_audio_decoder",
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include <memory> #include <memory>
#include "base/logging.h" #include "base/logging.h"
#include "build/build_config.h"
#include "media/mojo/buildflags.h" #include "media/mojo/buildflags.h"
#include "media/mojo/services/gpu_mojo_media_client.h" #include "media/mojo/services/gpu_mojo_media_client.h"
#include "media/mojo/services/media_service.h" #include "media/mojo/services/media_service.h"
...@@ -20,9 +21,7 @@ namespace media { ...@@ -20,9 +21,7 @@ namespace media {
std::unique_ptr<MediaService> CreateMediaService( std::unique_ptr<MediaService> CreateMediaService(
mojo::PendingReceiver<mojom::MediaService> receiver) { mojo::PendingReceiver<mojom::MediaService> receiver) {
#if BUILDFLAG(ENABLE_TEST_MOJO_MEDIA_CLIENT) #if defined(OS_ANDROID)
return CreateMediaServiceForTesting(std::move(receiver));
#elif defined(OS_ANDROID)
return std::make_unique<MediaService>( return std::make_unique<MediaService>(
std::make_unique<AndroidMojoMediaClient>(), std::move(receiver)); std::make_unique<AndroidMojoMediaClient>(), std::move(receiver));
#else #else
......
...@@ -29,8 +29,7 @@ namespace media { ...@@ -29,8 +29,7 @@ namespace media {
class MediaGpuChannelManager; class MediaGpuChannelManager;
// Creates a MediaService instance using the default MojoMediaClient on each // Creates a MediaService instance using the default MojoMediaClient on each
// platform. Uses the TestMojoMediaClient if |enable_test_mojo_media_client| is // platform.
// true.
std::unique_ptr<MediaService> MEDIA_MOJO_EXPORT std::unique_ptr<MediaService> MEDIA_MOJO_EXPORT
CreateMediaService(mojo::PendingReceiver<mojom::MediaService> receiver); CreateMediaService(mojo::PendingReceiver<mojom::MediaService> receiver);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment