Revert 221619 "Initial chrome.mdns API."

trunk/src/extensions/common/event_matcher.cc

 // Copyright (c) 2012 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 "extensions/common/event_matcher.h"
 
 #include "extensions/common/event_filtering_info.h"
 
 namespace {
 const char kUrlFiltersKey[] = "url";
 }
 
 namespace extensions {
 
-const char kEventFilterServiceTypeKey[] = "serviceType";
-
 EventMatcher::EventMatcher(scoped_ptr<base::DictionaryValue> filter,
                            int routing_id)
     : filter_(filter.Pass()),
       routing_id_(routing_id) {
 }
 
 EventMatcher::~EventMatcher() {
 }
 
 bool EventMatcher::MatchNonURLCriteria(
     const EventFilteringInfo& event_info) const {
-  if (event_info.has_instance_id()) {
-    return event_info.instance_id() == GetInstanceID();
-  }
+  if (!event_info.has_instance_id())
+    return true;
 
-  const std::string& service_type_filter = GetServiceTypeFilter();
-  return service_type_filter.empty() ||
-         service_type_filter == event_info.service_type();
+  return event_info.instance_id() == GetInstanceID();
 }
 
 int EventMatcher::GetURLFilterCount() const {
   base::ListValue* url_filters = NULL;
   if (filter_->GetList(kUrlFiltersKey, &url_filters))
     return url_filters->GetSize();
   return 0;
 }
 
 bool EventMatcher::GetURLFilter(int i, base::DictionaryValue** url_filter_out) {
   base::ListValue* url_filters = NULL;
   if (filter_->GetList(kUrlFiltersKey, &url_filters)) {
     return url_filters->GetDictionary(i, url_filter_out);
   }
   return false;
 }
 
 int EventMatcher::HasURLFilters() const {
   return GetURLFilterCount() != 0;
 }
 
-std::string EventMatcher::GetServiceTypeFilter() const {
-  std::string service_type_filter;
-  filter_->GetStringASCII(kEventFilterServiceTypeKey, &service_type_filter);
-  return service_type_filter;
-}
-
 int EventMatcher::GetInstanceID() const {
   int instance_id = 0;
   filter_->GetInteger("instanceId", &instance_id);
   return instance_id;
 }
 
 int EventMatcher::GetRoutingID() const {
   return routing_id_;
 }
 
 }  // namespace extensions