1 files changed, 14 insertions, 3 deletions
diff --git a/extensions/common/event_matcher.cc b/extensions/common/event_matcher.cc
index ad76c89..8ae022a 100644
--- a/extensions/common/event_matcher.cc
+++ b/extensions/common/event_matcher.cc
@@ -12,6 +12,8 @@ const char kUrlFiltersKey[] = "url";
 
 namespace extensions {
 
+const char kEventFilterServiceTypeKey[] = "serviceType";
+
 EventMatcher::EventMatcher(scoped_ptr<base::DictionaryValue> filter,
                            int routing_id)
     : filter_(filter.Pass()),
@@ -23,10 +25,13 @@ EventMatcher::~EventMatcher() {
 
 bool EventMatcher::MatchNonURLCriteria(
     const EventFilteringInfo& event_info) const {
-  if (!event_info.has_instance_id())
-    return true;
+  if (event_info.has_instance_id()) {
+    return event_info.instance_id() == GetInstanceID();
+  }
 
-  return event_info.instance_id() == GetInstanceID();
+  const std::string& service_type_filter = GetServiceTypeFilter();
+  return service_type_filter.empty() ||
+         service_type_filter == event_info.service_type();
 }
 
 int EventMatcher::GetURLFilterCount() const {
@@ -48,6 +53,12 @@ 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);