Index: chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc |
diff --git a/chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc b/chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc |
index 151e184b00573d2d7fcb3276bda7dc5f015cc2fc..3ffe291cb00ca5b0714dbec46f5577e8cef00204 100644 |
--- a/chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc |
+++ b/chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc |
@@ -98,15 +98,15 @@ std::unique_ptr<base::DictionaryValue> SinksAndIdentityToValue( |
sink_val->SetString("id", sink.id()); |
sink_val->SetString("name", sink.name()); |
sink_val->SetInteger("iconType", sink.icon_type()); |
- if (!sink.description().empty()) |
- sink_val->SetString("description", sink.description()); |
+ if (sink.description()) |
+ sink_val->SetString("description", *sink.description()); |
bool is_pseudo_sink = |
base::StartsWith(sink.id(), "pseudo:", base::CompareCase::SENSITIVE); |
- if (!user_domain.empty() && !sink.domain().empty()) { |
- std::string domain = sink.domain(); |
+ if (!user_domain.empty() && sink.domain() && !sink.domain()->empty()) { |
+ std::string domain = *sink.domain(); |
// Convert default domains to user domain |
- if (sink.domain() == "default") { |
+ if (domain == "default") { |
domain = user_domain; |
if (domain == Profile::kNoHostedDomainFound) { |
// Default domain will be empty for non-dasher accounts. |