Enable ServiceDiscoveryClientMdns.

chrome/browser/local_discovery/service_discovery_shared_client.cc

 // Copyright 2013 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/local_discovery/service_discovery_shared_client.h"
 
 #include "content/public/browser/browser_thread.h"
 
 #if defined(OS_WIN)
 #include "base/files/file_path.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/timer/elapsed_timer.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/firewall_manager_win.h"
 #endif  // OS_WIN
 
 #if defined(OS_MACOSX)
 #include "chrome/browser/local_discovery/service_discovery_client_mac_factory.h"
 #endif
 
 #if defined(ENABLE_MDNS)
+#include "chrome/browser/local_discovery/service_discovery_client_mdns.h"
 #include "chrome/browser/local_discovery/service_discovery_client_utility.h"
 #endif  // ENABLE_MDNS
 
 namespace {
 
 #if defined(OS_WIN)
+
+bool g_is_firewall_ready = false;
+
 void ReportFirewallStats() {
   base::FilePath exe_path;
   if (!PathService::Get(base::FILE_EXE, &exe_path))
     return;
   base::ElapsedTimer timer;
   scoped_ptr<installer::FirewallManager> manager =
       installer::FirewallManager::Create(BrowserDistribution::GetDistribution(),
                                          exe_path);
   if (!manager)
     return;
-  bool is_ready = manager->CanUseLocalPorts();
+  g_is_firewall_ready = manager->CanUseLocalPorts();
   UMA_HISTOGRAM_TIMES("LocalDiscovery.FirewallAccessTime", timer.Elapsed());
-  UMA_HISTOGRAM_BOOLEAN("LocalDiscovery.IsFirewallReady", is_ready);
+  UMA_HISTOGRAM_BOOLEAN("LocalDiscovery.IsFirewallReady", g_is_firewall_ready);
 }
 #endif  // OS_WIN
 
 }  // namespace
 
 
 namespace local_discovery {
 
 using content::BrowserThread;
 
@@ skipping 21 matching lines @@
     return g_service_discovery_client;
 
 #if defined(OS_MACOSX)
   return ServiceDiscoveryClientMacFactory::CreateInstance();
 #else  // OS_MACOSX
 
 #if defined(OS_WIN)
   static bool reported =
       BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
                               base::Bind(&ReportFirewallStats));
+  // TODO(vitalybuka): Switch to |ServiceDiscoveryClientMdns| after we find what
+  // to do with firewall for user-level installs. crbug.com/366408
+  if (!g_is_firewall_ready)
+    return new ServiceDiscoveryClientUtility();

[Noam Samuel, 2014/05/14 18:35:09]

Does this mean that ServiceDiscoveryClientUtility and ServiceDiscoveryClientMDns
could both be running at the same time on Windows?

[Vitaly Buka (NO REVIEWS), 2014/05/14 19:11:41]

No. Only one is alive in time.
Check g_service_discovery_client.

On 2014/05/14 18:35:09, Noam Samuel wrote:

[Noam Samuel, 2014/05/14 19:54:45]

Wait, so does this mean that Chrome on Windows will nondeterministically use
ServiceDiscoveryClientUtility or ServiceDiscoveryClientMdns based on a race
between the UI and file threads?

 #endif  // OS_WIN
 
-  // TODO(vitalybuka): Switch to |ServiceDiscoveryClientMdns| after we find what
-  // to do with firewall for user-level installs. crbug.com/366408
-  return new ServiceDiscoveryClientUtility();
+  return new ServiceDiscoveryClientMdns();
 #endif // OS_MACOSX
 }
 
 #else
 
 scoped_refptr<ServiceDiscoverySharedClient>
     ServiceDiscoverySharedClient::GetInstance() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   NOTIMPLEMENTED();
   return NULL;
 }
 
 #endif  // ENABLE_MDNS
 
 }  // namespace local_discovery