Commit 5ce63686 authored by Guohui Deng's avatar Guohui Deng Committed by Commit Bot

Define kChromecastServiceName in one file

The Chromecast Service Name is now defined in one
file, and duplicated definitions are eliminated.

Bug: internal b/111850629.
Test: Build cast_shell.
Change-Id: I8856313bf925c4db5c444bbb7a94515c89442b28
Reviewed-on: https://chromium-review.googlesource.com/1155654Reviewed-by: default avatarDaniel Cheng <dcheng@chromium.org>
Reviewed-by: default avatarLuke Halliwell <halliwell@chromium.org>
Reviewed-by: default avatarKenneth MacKay <kmackay@chromium.org>
Reviewed-by: default avatarBailey Forrest <bcf@chromium.org>
Commit-Queue: Guohui Deng <guohuideng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#579829}
parent 57519c06
......@@ -7,6 +7,7 @@ import("//mojo/public/tools/bindings/mojom.gni")
mojom("mojom") {
sources = [
"application_media_capabilities.mojom",
"constants.mojom",
"media_caps.mojom",
"media_load_deferrer.mojom",
"memory_pressure.mojom",
......
// Copyright 2018 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;
const string kChromecastServiceName = "chromecast";
\ No newline at end of file
......@@ -10,6 +10,7 @@
#include "base/bind.h"
#include "base/test/scoped_task_environment.h"
#include "chromecast/common/mojom/constants.mojom.h"
#include "chromecast/common/mojom/multiroom.mojom.h"
#include "chromecast/media/audio/cast_audio_output_stream.h"
#include "chromecast/media/cma/test/mock_cma_backend.h"
......@@ -27,7 +28,6 @@ using testing::Return;
using testing::StrictMock;
namespace {
constexpr char kChromecastServiceName[] = "chromecast";
std::unique_ptr<service_manager::Connector> CreateConnector() {
service_manager::mojom::ConnectorRequest request;
......@@ -54,7 +54,7 @@ class CastAudioManagerTest : public testing::Test {
// Set the test connector to override interface bindings.
service_manager::Connector::TestApi connector_test_api(connector_.get());
connector_test_api.OverrideBinderForTesting(
service_manager::Identity(kChromecastServiceName),
service_manager::Identity(chromecast::mojom::kChromecastServiceName),
mojom::MultiroomManager::Name_,
base::BindRepeating(&CastAudioManagerTest::BindMultiroomManager,
base::Unretained(this)));
......
......@@ -16,6 +16,7 @@
#include "base/threading/thread_task_runner_handle.h"
#include "chromecast/base/metrics/cast_metrics_helper.h"
#include "chromecast/base/task_runner_impl.h"
#include "chromecast/common/mojom/constants.mojom.h"
#include "chromecast/common/mojom/multiroom.mojom.h"
#include "chromecast/media/audio/cast_audio_manager.h"
#include "chromecast/media/cma/backend/cma_backend.h"
......@@ -31,7 +32,6 @@
#include "media/base/decoder_buffer.h"
namespace {
constexpr char kChromecastServiceName[] = "chromecast";
const int kMaxQueuedDataMs = 1000;
} // namespace
......@@ -79,7 +79,8 @@ class CastAudioOutputStream::Backend : public CmaBackend::Decoder::Delegate {
std::move(bind_connector_request_cb).Run(std::move(connector_request));
// Connect to the Multiroom interface and fetch the current info.
connector->BindInterface(kChromecastServiceName, &multiroom_manager_);
connector->BindInterface(chromecast::mojom::kChromecastServiceName,
&multiroom_manager_);
multiroom_manager_.set_connection_error_handler(base::BindOnce(
&CastAudioOutputStream::Backend::OnGetMultiroomInfo,
base::Unretained(this), audio_manager, application_session_id,
......
......@@ -14,6 +14,7 @@
#include "base/run_loop.h"
#include "base/test/scoped_task_environment.h"
#include "base/time/time.h"
#include "chromecast/common/mojom/constants.mojom.h"
#include "chromecast/common/mojom/multiroom.mojom.h"
#include "chromecast/media/audio/cast_audio_manager.h"
#include "chromecast/media/audio/cast_audio_mixer.h"
......@@ -41,7 +42,6 @@ namespace {
const char kDefaultDeviceId[] = "";
const int64_t kDelayUs = 123;
const int64_t kDelayTimestampUs = 123456789;
constexpr char kChromecastServiceName[] = "chromecast";
std::unique_ptr<service_manager::Connector> CreateConnector() {
service_manager::mojom::ConnectorRequest request;
......@@ -217,7 +217,7 @@ class CastAudioOutputStreamTest : public ::testing::Test {
// Set the test connector to override interface bindings.
service_manager::Connector::TestApi connector_test_api(connector_.get());
connector_test_api.OverrideBinderForTesting(
service_manager::Identity(kChromecastServiceName),
service_manager::Identity(chromecast::mojom::kChromecastServiceName),
mojom::MultiroomManager::Name_,
base::BindRepeating(&CastAudioOutputStreamTest::BindMultiroomManager,
base::Unretained(this)));
......
......@@ -12,6 +12,7 @@
#include "base/logging.h"
#include "base/single_thread_task_runner.h"
#include "chromecast/base/task_runner_impl.h"
#include "chromecast/common/mojom/constants.mojom.h"
#include "chromecast/media/base/audio_device_ids.h"
#include "chromecast/media/base/video_mode_switcher.h"
#include "chromecast/media/base/video_resolution_policy.h"
......@@ -39,8 +40,6 @@ namespace media {
namespace {
constexpr char kChromecastServiceName[] = "chromecast";
// Maximum difference between audio frame PTS and video frame PTS
// for frames read from the DemuxerStream.
const base::TimeDelta kMaxDeltaFetcher(base::TimeDelta::FromMilliseconds(2000));
......@@ -136,7 +135,8 @@ void CastRenderer::OnApplicationSessionIdReceived(
chromecast::mojom::MultiroomInfo::New());
return;
}
connector_->BindInterface(kChromecastServiceName, &multiroom_manager_);
connector_->BindInterface(chromecast::mojom::kChromecastServiceName,
&multiroom_manager_);
multiroom_manager_.set_connection_error_handler(
base::BindOnce(&CastRenderer::OnGetMultiroomInfo, base::Unretained(this),
media_resource, client, init_cb, application_session_id,
......
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