[Media Router] Conditionally enable mDNS on Windows.

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

Index: chrome/browser/ui/webui/media_router/media_router_ui.cc
diff --git a/chrome/browser/ui/webui/media_router/media_router_ui.cc b/chrome/browser/ui/webui/media_router/media_router_ui.cc
index 7bf21a1e359948f7252ebb8902ab7d130caa1020..4f7b09de15e9b0543d480c002e4ae45a27cc3aab 100644
--- a/chrome/browser/ui/webui/media_router/media_router_ui.cc
+++ b/chrome/browser/ui/webui/media_router/media_router_ui.cc
@@ -14,6 +14,7 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/trace_event/trace_event.h"
+#include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/media/router/create_presentation_connection_request.h"
 #include "chrome/browser/media/router/issue.h"
@@ -250,6 +251,11 @@ void MediaRouterUI::InitCommon(content::WebContents* initiator) {
   TRACE_EVENT_NESTABLE_ASYNC_INSTANT1("media_router", "UI", initiator,
                                       "MediaRouterUI::InitCommon", this);
 
+#if defined(OS_WIN)
+  if (!router_->should_enable_mdns_discovery()) {

[mark a. foltz, 2016/03/24 22:59:33]

IMO, this is confusing to read.

One solution:

1. The router could keep track of whether EnableMdnsDiscovery has already been
called on the MRPM by adding an internal flag
2. The method below is renamed to EnsureMdnsDiscoveryEnabled() (no-op if the
flag in #1 is true)
3. Just call EnsureMdnsDiscoveryEnabled() here.


 

[btolsch, 2016/03/25 04:40:50]

I thought about putting a comment here since that if reads pretty badly, but I
like this better.

+    router_->EnableMdnsDiscovery();
+  }
+#endif
   // Create |collator_| before |query_result_manager_| so that |collator_| is
   // already set up when we get a callback from |query_result_manager_|.
   UErrorCode error = U_ZERO_ERROR;