[Media Router] Improve error message in CastMediaSinkServiceImpl

Bug: b/165366974, 1117673
Change-Id: Ieec1543d9fb6cd5a6e77d5790ee4c2138174b305
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2466388Reviewed-by: Takumi Fujimoto <takumif@chromium.org>
Commit-Queue: Muyao Xu <muyaoxu@google.com>
Cr-Commit-Position: refs/heads/master@{#816607}

chrome/browser/media/router/discovery/mdns/cast_media_sink_service_impl.cc

@@ -306,12 +306,6 @@ void CastMediaSinkServiceImpl::OnError(const cast_channel::CastSocket& socket,
   cast_channel::LastError last_error =
       cast_socket_service_->GetLogger()->GetLastError(socket.id());
   MediaRouterChannelError error_code = RecordError(error_state, last_error);
-  if (logger_.is_bound()) {
-    logger_->LogError(mojom::LogCategory::kDiscovery, kLoggerComponent,
-                      base::StringPrintf("Cast Channel Error Code: %d",
-                                         static_cast<int>(error_code)),
-                      "", "", "");
-  }
 
   net::IPEndPoint ip_endpoint = socket.ip_endpoint();
   // Need a PostTask() here because RemoveSocket() will release the memory of
@@ -331,6 +325,13 @@ void CastMediaSinkServiceImpl::OnError(const cast_channel::CastSocket& socket,
       std::find_if(sinks.begin(), sinks.end(), [&socket_id](const auto& entry) {
         return entry.second.cast_data().cast_channel_id == socket_id;
       });
+  if (logger_.is_bound()) {
+    auto sink_id = sink_it == sinks.end() ? "" : sink_it->first;
+    logger_->LogError(mojom::LogCategory::kDiscovery, kLoggerComponent,
+                      base::StringPrintf("MediaRouterChannelError: %d",
+                                         static_cast<int>(error_code)),
+                      sink_id, "", "");
+  }
   if (sink_it == sinks.end()) {
     return;
   }