<webview>: Add support for filtering extension events by instanceId.

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 {
 
 EventMatcher::EventMatcher(scoped_ptr<base::DictionaryValue> filter)
     : filter_(filter.Pass()) {
 }
 
 EventMatcher::~EventMatcher() {
 }
 
 bool EventMatcher::MatchNonURLCriteria(
     const EventFilteringInfo& event_info) const {
-  // There is currently no criteria apart from URL criteria.
-  return true;
+  if (!event_info.has_instance_id())
+    return true;
+  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;
 }
 
+int EventMatcher::GetInstanceID() const {
+  int instance_id = 0;
+  filter_->GetInteger("instanceId", &instance_id);

[Matt Perry, 2013/06/18 23:29:02]

Is 0 an invalid instanceId? (I'm wondering what will happen if instanceId is not
in the filter.)

[Fady Samuel, 2013/06/19 01:15:16]

Yes, 0 is an invalid instanceId. If a listener doesn't have an instance ID, it
will have an ID of 0. I will add a web_view_constants.cc in a subsequent CL and
replace these 0s with the constant.

+  return instance_id;
+}
+
 }  // namespace extensions