[Reland][Extensions Bindings] Add support for filtered events

extensions/renderer/native_extension_bindings_system_unittest.cc

Index: extensions/renderer/native_extension_bindings_system_unittest.cc
diff --git a/extensions/renderer/native_extension_bindings_system_unittest.cc b/extensions/renderer/native_extension_bindings_system_unittest.cc
index 7e82ac26897b410fa05b57a961d86230d086df16..45af2f47db9c9c4d8dfb4073d1f330e5c81f3488 100644
--- a/extensions/renderer/native_extension_bindings_system_unittest.cc
+++ b/extensions/renderer/native_extension_bindings_system_unittest.cc
@@ -68,10 +68,11 @@ scoped_refptr<Extension> CreateExtension(
 
 class EventChangeHandler {
  public:
-  MOCK_METHOD3(OnChange,
+  MOCK_METHOD4(OnChange,
                void(binding::EventListenersChanged,
                     ScriptContext*,
-                    const std::string& event_name));
+                    const std::string& event_name,
+                    const base::DictionaryValue* filter));
 };
 
 }  // namespace
@@ -130,9 +131,10 @@ class NativeExtensionBindingsSystemUnittest : public APIBindingTest {
 
   void MockSendListenerIPC(binding::EventListenersChanged changed,
                            ScriptContext* context,
-                           const std::string& event_name) {
+                           const std::string& event_name,
+                           const base::DictionaryValue* filter) {
     if (event_change_handler_)
-      event_change_handler_->OnChange(changed, context, event_name);
+      event_change_handler_->OnChange(changed, context, event_name, filter);
   }
 
   ScriptContext* CreateScriptContext(v8::Local<v8::Context> v8_context,
@@ -567,11 +569,10 @@ TEST_F(NativeExtensionBindingsSystemUnittest, TestEventRegistration) {
       "});";
   v8::Local<v8::Function> add_listener =
       FunctionFromString(context, kAddListener);
-  EXPECT_CALL(
-      *event_change_handler(),
-      OnChange(binding::EventListenersChanged::HAS_LISTENERS,
-               script_context,
-               kEventName)).Times(1);
+  EXPECT_CALL(*event_change_handler(),
+              OnChange(binding::EventListenersChanged::HAS_LISTENERS,
+                       script_context, kEventName, nullptr))
+      .Times(1);
   v8::Local<v8::Value> argv[] = {listener};
   RunFunction(add_listener, context, arraysize(argv), argv);
   ::testing::Mock::VerifyAndClearExpectations(event_change_handler());
@@ -581,11 +582,10 @@ TEST_F(NativeExtensionBindingsSystemUnittest, TestEventRegistration) {
       "(function(listener) {\n"
       "  chrome.idle.onStateChanged.removeListener(listener);\n"
       "});";
-  EXPECT_CALL(
-      *event_change_handler(),
-      OnChange(binding::EventListenersChanged::NO_LISTENERS,
-               script_context,
-               kEventName)).Times(1);
+  EXPECT_CALL(*event_change_handler(),
+              OnChange(binding::EventListenersChanged::NO_LISTENERS,
+                       script_context, kEventName, nullptr))
+      .Times(1);
   v8::Local<v8::Function> remove_listener =
       FunctionFromString(context, kRemoveListener);
   RunFunction(remove_listener, context, arraysize(argv), argv);
@@ -627,7 +627,7 @@ TEST_F(NativeExtensionBindingsSystemUnittest,
       FunctionFromString(context, kUseAppRuntime);
   EXPECT_CALL(*event_change_handler(),
               OnChange(binding::EventListenersChanged::HAS_LISTENERS,
-                       script_context, "app.runtime.onLaunched"))
+                       script_context, "app.runtime.onLaunched", nullptr))
       .Times(1);
   RunFunctionOnGlobal(use_app_runtime, context, 0, nullptr);
   ::testing::Mock::VerifyAndClearExpectations(event_change_handler());