Enable chrome.mdns for Chrome Apps

chrome/browser/extensions/api/mdns/mdns_api.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/extensions/api/mdns/mdns_api.h"
 
 #include <vector>
 
 #include "base/lazy_instance.h"
 #include "base/profiler/scoped_profile.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/common/extensions/api/mdns.h"
 
 namespace extensions {
 
 namespace mdns = api::mdns;
 
-namespace {
-
-// Whitelisted mDNS service types.
-const char kCastServiceType[] = "_googlecast._tcp.local";
-const char kPrivetServiceType[] = "_privet._tcp.local";
-const char kTestServiceType[] = "_testing._tcp.local";
-
-bool IsServiceTypeWhitelisted(const std::string& service_type) {
-  return service_type == kCastServiceType ||
-         service_type == kPrivetServiceType ||
-         service_type == kTestServiceType;
-}
-
-}  // namespace
-
 MDnsAPI::MDnsAPI(content::BrowserContext* context) : browser_context_(context) {
   DCHECK(browser_context_);
   EventRouter::Get(context)
       ->RegisterObserver(this, mdns::OnServiceList::kEventName);
 }
 
 MDnsAPI::~MDnsAPI() {
   if (dns_sd_registry_.get()) {
     dns_sd_registry_->RemoveObserver(this);
   }
@@ skipping 64 matching lines @@
       base::STLSetDifference<std::set<std::string> >(
           new_service_types, service_types_);
   std::set<std::string> removed_service_types =
       base::STLSetDifference<std::set<std::string> >(
           service_types_, new_service_types);
 
   // Update the registry.
   DnsSdRegistry* registry = dns_sd_registry();
   for (std::set<std::string>::iterator it = added_service_types.begin();
        it != added_service_types.end(); ++it) {
-    if (IsServiceTypeWhitelisted(*it))
-      registry->RegisterDnsSdListener(*it);
+    registry->RegisterDnsSdListener(*it);

[mark a. foltz, 2014/10/31 06:29:15]

To preserve existing behavior, I think extensions should be limited by the
existing whitelist as far as what services they can listen for.  We can discuss
as part of the API review if this can be relaxed. 

However, this would require some refactoring as the event filtering is currently
done only by service type and not the type of listener (extension vs. platform
app).

[Red Daly, 2014/11/17 22:50:01]

Done.

   }
   for (std::set<std::string>::iterator it = removed_service_types.begin();
        it != removed_service_types.end(); ++it) {
-    if (IsServiceTypeWhitelisted(*it))
-      registry->UnregisterDnsSdListener(*it);
+    registry->UnregisterDnsSdListener(*it);
   }
 
   service_types_ = new_service_types;
 }
 
 void MDnsAPI::OnDnsSdEvent(const std::string& service_type,
                            const DnsSdRegistry::DnsSdServiceList& services) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   std::vector<linked_ptr<mdns::MDnsService> > args;
@@ skipping 15 matching lines @@
   event->filter_info.SetServiceType(service_type);
 
   VLOG(1) << "Broadcasting OnServiceList event: " << event.get();
 
   // TODO(justinlin): To avoid having listeners without filters getting all
   // events, modify API to have this event require filters.
   extensions::EventRouter::Get(browser_context_)->BroadcastEvent(event.Pass());
 }
 
 }  // namespace extensions