Commit 31ee03a7 authored by Abul Hasan Md Osama's avatar Abul Hasan Md Osama Committed by Commit Bot

Renaming SERVICE_NOT_CONNECTED to INVALID_ANSWER_MESSAGE.

Bug: 1015473
Change-Id: Icc8101ef374a8b00d4d1ad6986dedaffcc54a6bf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1911882Reviewed-by: default avatarmark a. foltz <mfoltz@chromium.org>
Reviewed-by: default avatarTom Sepez <tsepez@chromium.org>
Commit-Queue: mark a. foltz <mfoltz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715339}
parent 7c0794dd
......@@ -18,6 +18,7 @@ Abhijeet Kandalkar <abhijeet.k@samsung.com>
Abhishek Agarwal <abhishek.a21@samsung.com>
Abhishek Kanike <abhishek.ka@samsung.com>
Abhishek Singh <abhi.rathore@samsung.com>
Abul Hasan Md Osama <ahm.osama@samsung.com>
Adam Bonner <abonner-chromium@solscope.com>
Adam Bujalski <abujalski@gmail.com>
Adam Kallai <kadam@inf.u-szeged.hu>
......
......@@ -310,8 +310,8 @@ void CastRemotingConnector::StartRemoting(RemotingBridge* bridge) {
// Refuse to start if there is no remoting route available, or if remoting is
// already active.
if (!deprecated_remoter_ && !remoter_) {
DVLOG(2) << "Remoting start failed: No mirror service connected.";
bridge->OnStartFailed(RemotingStartFailReason::SERVICE_NOT_CONNECTED);
DVLOG(2) << "Remoting start failed: Invalid ANSWER message.";
bridge->OnStartFailed(RemotingStartFailReason::INVALID_ANSWER_MESSAGE);
return;
}
if (active_bridge_) {
......
......@@ -358,7 +358,7 @@ TEST_F(CastRemotingConnectorTest, NoConnectedMediaRemoter) {
mojo::Remote<media::mojom::Remoter> remoter(CreateRemoter(&source));
EXPECT_CALL(source,
OnStartFailed(RemotingStartFailReason::SERVICE_NOT_CONNECTED))
OnStartFailed(RemotingStartFailReason::INVALID_ANSWER_MESSAGE))
.Times(1);
remoter->Start();
RunUntilIdle();
......
......@@ -91,10 +91,8 @@ void MediaRemoter::OnMirroringResumed() {
void MediaRemoter::OnRemotingFailed() {
DCHECK(state_ == STARTING_REMOTING || state_ == REMOTING_STARTED);
if (state_ == STARTING_REMOTING) {
// TODO(crbug.com/1015473): Rename SERVICE_NOT_CONNECTED to
// INVALID_ANSWER_MESSAGE.
remoting_source_->OnStartFailed(
media::mojom::RemotingStartFailReason::SERVICE_NOT_CONNECTED);
media::mojom::RemotingStartFailReason::INVALID_ANSWER_MESSAGE);
}
state_ = REMOTING_DISABLED;
remoting_source_->OnSinkGone();
......
......@@ -272,7 +272,7 @@ class SessionTest : public mojom::ResourceProvider,
EXPECT_CALL(*this, OnOutboundMessage("OFFER")).Times(1);
// The start of remoting is expected to fail.
EXPECT_CALL(remoting_source_,
OnStartFailed(RemotingStartFailReason::SERVICE_NOT_CONNECTED))
OnStartFailed(RemotingStartFailReason::INVALID_ANSWER_MESSAGE))
.Times(1);
EXPECT_CALL(remoting_source_, OnSinkGone()).Times(AtLeast(1));
}
......
......@@ -18,7 +18,7 @@ enum RemotingStopReason {
enum RemotingStartFailReason {
CANNOT_START_MULTIPLE, // Remoting was already active.
ROUTE_TERMINATED, // User-initated disconnect while starting remoting.
SERVICE_NOT_CONNECTED, // Mirror service was not connected.
INVALID_ANSWER_MESSAGE, // Invalid ANSWER message.
};
enum RemotingSinkFeature {
......
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