[Media Router WebUI] Don't let pseudo sinks alone show user email.

chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/media_router/media_router_webui_message_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 83 matching lines @@
   for (const MediaSinkWithCastModes& sink_with_cast_modes : sinks) {
     std::unique_ptr<base::DictionaryValue> sink_val(new base::DictionaryValue);
 
     const MediaSink& sink = sink_with_cast_modes.sink;
     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());
 
+    bool is_pseudo_sink =
+        base::StartsWith(sink.id(), "pseudo:", base::CompareCase::SENSITIVE);
     if (!user_domain.empty() && !sink.domain().empty()) {
       std::string domain = sink.domain();
       // Convert default domains to user domain
       if (sink.domain() == "default") {
         domain = user_domain;
         if (domain == Profile::kNoHostedDomainFound) {
           // Default domain will be empty for non-dasher accounts.
           domain.clear();
         }
       }
 
       sink_val->SetString("domain", domain);
 
-      show_email = true;
-      if (!domain.empty() && domain != user_domain)
+      show_email = show_email || !is_pseudo_sink;
+      if (!domain.empty() && domain != user_domain) {
         show_domain = true;
+      }
     }
 
     int cast_mode_bits = 0;
     for (MediaCastMode cast_mode : sink_with_cast_modes.cast_modes)
       cast_mode_bits |= cast_mode;
 
     sink_val->SetInteger("castModes", cast_mode_bits);
-    sink_val->SetBoolean(
-        "isPseudoSink",
-        base::StartsWith(sink.id(), "pseudo:", base::CompareCase::SENSITIVE));
+    sink_val->SetBoolean("isPseudoSink", is_pseudo_sink);
     sinks_val->Append(sink_val.release());
   }
 
   sink_list_and_identity->Set("sinks", sinks_val.release());
   sink_list_and_identity->SetBoolean("showEmail", show_email);
   sink_list_and_identity->SetBoolean("showDomain", show_domain);
   return sink_list_and_identity;
 }
 
 std::unique_ptr<base::DictionaryValue> RouteToValue(
@@ skipping 730 matching lines @@
 #endif  // defined(GOOGLE_CHROME_BUILD)
 
   return AccountInfo();
 }
 
 void MediaRouterWebUIMessageHandler::SetWebUIForTest(content::WebUI* web_ui) {
   set_web_ui(web_ui);
 }
 
 }  // namespace media_router