Sync protocol cleanup: Remove SyncProtocolError::url

This field is unused except for displaying it in
chrome://sync-internals, and apparently it also always empty in
practice.

Bug: 1139903
Change-Id: Ib5345594dc6d5bc0bd5d967c8dd9d08ba3781e08
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2484593Reviewed-by: Tim Schumann <tschumann@chromium.org>
Commit-Queue: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#818470}

chrome/browser/sync/test/integration/sync_errors_test.cc

@@ -128,7 +128,6 @@ IN_PROC_BROWSER_TEST_F(SyncErrorTest, ActionableErrorTest) {
   GetSyncService(0)->QueryDetailedSyncStatusForDebugging(&status);
   ASSERT_EQ(status.sync_protocol_error.error_type, syncer::TRANSIENT_ERROR);
   ASSERT_EQ(status.sync_protocol_error.action, syncer::UPGRADE_CLIENT);
-  ASSERT_EQ(status.sync_protocol_error.url, url);
   ASSERT_EQ(status.sync_protocol_error.error_description, description);
 }
 

components/sync/driver/sync_internals_util.cc

@@ -632,20 +632,17 @@ std::unique_ptr<base::DictionaryValue> ConstructAboutInformation(
   base::Value actionable_error(base::Value::Type::LIST);
   Stat<std::string> error_type("Error Type", kUninitialized);
   Stat<std::string> action("Action", kUninitialized);
-  Stat<std::string> url("URL", kUninitialized);
   Stat<std::string> description("Error Description", kUninitialized);
 
   if (actionable_error_detected) {
     error_type.Set(
         GetSyncErrorTypeString(full_status.sync_protocol_error.error_type));
     action.Set(GetClientActionString(full_status.sync_protocol_error.action));
-    url.Set(full_status.sync_protocol_error.url);
     description.Set(full_status.sync_protocol_error.error_description);
   }
 
   actionable_error.Append(error_type.ToValue());
   actionable_error.Append(action.ToValue());
-  actionable_error.Append(url.ToValue());
   actionable_error.Append(description.ToValue());
   about_info->SetKey("actionable_error", std::move(actionable_error));
 

components/sync/engine_impl/syncer_proto_util.cc

@@ -249,7 +249,6 @@ SyncProtocolError ConvertErrorPBToSyncProtocolError(
   sync_protocol_error.error_type =
       PBErrorTypeToSyncProtocolErrorType(error.error_type());
   sync_protocol_error.error_description = error.error_description();
-  sync_protocol_error.url = error.url();
   sync_protocol_error.action = PBActionToClientAction(error.action());
 
   if (error.error_data_type_ids_size() > 0) {

components/sync/protocol/proto_visitors.h

@@ -297,7 +297,6 @@ VISIT_PROTO_FIELDS(const sync_pb::ClientToServerResponse& proto) {
 VISIT_PROTO_FIELDS(const sync_pb::ClientToServerResponse::Error& proto) {
   VISIT_ENUM(error_type);
   VISIT(error_description);
-  VISIT(url);
   VISIT_ENUM(action);
 }
 

components/sync/protocol/sync.proto

@@ -968,7 +968,8 @@ message ClientToServerResponse {
   message Error {
     optional SyncEnums.ErrorType error_type = 1 [default = UNKNOWN];
     optional string error_description = 2;
-    optional string url = 3;
+    reserved 3;
+    reserved "url";
     optional SyncEnums.Action action = 4 [default = UNKNOWN_ACTION];
 
     // Currently meaningful if |error_type| is throttled or partial_failure.

components/sync/protocol/sync_protocol_error.cc

@@ -57,7 +57,6 @@ std::unique_ptr<base::DictionaryValue> SyncProtocolError::ToValue() const {
   auto value = std::make_unique<base::DictionaryValue>();
   value->SetString("ErrorType", GetSyncErrorTypeString(error_type));
   value->SetString("ErrorDescription", error_description);
-  value->SetString("url", url);
   value->SetString("action", GetClientActionString(action));
   return value;
 }

components/sync/protocol/sync_protocol_error.h

@@ -73,7 +73,6 @@ enum ClientAction {
 struct SyncProtocolError {
   SyncProtocolErrorType error_type;
   std::string error_description;
-  std::string url;
   ClientAction action;
   ModelTypeSet error_data_types;
   SyncProtocolError();

components/sync/test/fake_server/fake_server.cc

@@ -550,7 +550,6 @@ void FakeServer::TriggerActionableError(
       new sync_pb::ClientToServerResponse_Error();
   error->set_error_type(error_type);
   error->set_error_description(description);
-  error->set_url(url);
   error->set_action(action);
   triggered_actionable_error_.reset(error);
 }