Removing deprecated 'description' field from It2Me error messages
This field was supposed to be replaced by error_code (now errorCode)
back in M61 but it appears that never happened. I've updated the client
to look at the errorCode/error_code field so setting the description is
no longer needed so I'm removing it.
Change-Id: I781982f051b8422117b6c8f7a31fbf4dc43de12a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4134102
Reviewed-by: Jamie Walch <jamiewalch@chromium.org>
Auto-Submit: Joe Downing <joedow@chromium.org>
Commit-Queue: Jamie Walch <jamiewalch@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1089227}
diff --git a/remoting/host/it2me/it2me_constants.cc b/remoting/host/it2me/it2me_constants.cc
index b172a557..93c2834 100644
--- a/remoting/host/it2me/it2me_constants.cc
+++ b/remoting/host/it2me/it2me_constants.cc
@@ -53,7 +53,6 @@
const char kErrorMessage[] = "error";
const char kErrorMessageCode[] = "errorCode";
-const char kErrorMessageDescription[] = "description";
const char kNatPolicyChangedMessage[] = "natPolicyChanged";
const char kNatPolicyChangedMessageNatEnabled[] = "natTraversalEnabled";
diff --git a/remoting/host/it2me/it2me_constants.h b/remoting/host/it2me/it2me_constants.h
index 3c1bc4c..eca342b 100644
--- a/remoting/host/it2me/it2me_constants.h
+++ b/remoting/host/it2me/it2me_constants.h
@@ -97,7 +97,6 @@
// Generic message sent from the host to the client when an error occurs.
extern const char kErrorMessage[];
extern const char kErrorMessageCode[];
-extern const char kErrorMessageDescription[];
// Sent from the host when there is a change in the NAT traversal policies.
extern const char kNatPolicyChangedMessage[];
diff --git a/remoting/host/it2me/it2me_native_messaging_host.cc b/remoting/host/it2me/it2me_native_messaging_host.cc
index b5920a93..031bf32 100644
--- a/remoting/host/it2me/it2me_native_messaging_host.cc
+++ b/remoting/host/it2me/it2me_native_messaging_host.cc
@@ -447,8 +447,6 @@
DCHECK(task_runner()->BelongsToCurrentThread());
response.Set(kMessageType, kErrorMessage);
response.Set(kErrorMessageCode, ErrorCodeToString(error_code));
- // TODO(kelvinp): Remove this after M61 Webapp is pushed to 100%.
- response.Set(kErrorMessageDescription, ErrorCodeToString(error_code));
SendMessageToClient(std::move(response));
// Trigger a host shutdown by sending an empty message.
@@ -500,8 +498,6 @@
// is sent can be communicated.
message.Set(kMessageType, kErrorMessage);
message.Set(kErrorMessageCode, ErrorCodeToString(error_code));
- // TODO(kelvinp): Remove this after M61 Webapp is pushed to 100%.
- message.Set(kErrorMessageDescription, ErrorCodeToString(error_code));
break;
default:
diff --git a/remoting/host/it2me/it2me_native_messaging_host_lacros.cc b/remoting/host/it2me/it2me_native_messaging_host_lacros.cc
index e686629..9900746 100644
--- a/remoting/host/it2me/it2me_native_messaging_host_lacros.cc
+++ b/remoting/host/it2me/it2me_native_messaging_host_lacros.cc
@@ -451,7 +451,6 @@
message.Set(kMessageId, message_id);
}
message.Set(kErrorMessageCode, ErrorCodeToString(error_code));
- message.Set(kErrorMessageDescription, ErrorCodeToString(error_code));
SendMessageToClient(std::move(message));