[Extensions Bindings] Introduce a supportsLazyListeners property

extensions/renderer/native_extension_bindings_system.cc

 // Copyright 2016 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/renderer/native_extension_bindings_system.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "content/public/common/console_message_level.h"
@@ skipping 729 matching lines @@
   params->service_worker_version_id = kInvalidServiceWorkerVersionId;
 
   ipc_message_sender_->SendRequestIPC(script_context, std::move(params),
                                       request->thread);
 }
 
 void NativeExtensionBindingsSystem::OnEventListenerChanged(
     const std::string& event_name,
     binding::EventListenersChanged change,
     const base::DictionaryValue* filter,
-    bool was_manual,
+    bool update_lazy_listeners,
     v8::Local<v8::Context> context) {
   ScriptContext* script_context =
       ScriptContextSet::GetContextByV8Context(context);
   // Note: Check context_type() first to avoid accessing ExtensionFrameHelper on
   // a worker thread.
   bool is_lazy =
-      script_context->context_type() == Feature::SERVICE_WORKER_CONTEXT ||
-      ExtensionFrameHelper::IsContextForEventPage(script_context);
+      update_lazy_listeners &&
+      (script_context->context_type() == Feature::SERVICE_WORKER_CONTEXT ||
+       ExtensionFrameHelper::IsContextForEventPage(script_context));
   // We only remove a lazy listener if the listener removal was triggered
   // manually by the extension.
-  bool remove_lazy_listener = is_lazy && was_manual;
 
   if (filter) {  // Filtered event listeners.
     DCHECK(filter);
     if (change == binding::EventListenersChanged::HAS_LISTENERS) {
       ipc_message_sender_->SendAddFilteredEventListenerIPC(
           script_context, event_name, *filter, is_lazy);
     } else {
       DCHECK_EQ(binding::EventListenersChanged::NO_LISTENERS, change);
       ipc_message_sender_->SendRemoveFilteredEventListenerIPC(
-          script_context, event_name, *filter, remove_lazy_listener);
+          script_context, event_name, *filter, is_lazy);
     }
   } else {  // Unfiltered event listeners.
     if (change == binding::EventListenersChanged::HAS_LISTENERS) {
       // TODO(devlin): The JS bindings code only adds one listener per extension
       // per event per process, whereas this is one listener per context per
       // event per process. Typically, this won't make a difference, but it
       // could if there are multiple contexts for the same extension (e.g.,
       // multiple frames). In that case, it would result in extra IPCs being
       // sent. I'm not sure it's a big enough deal to warrant refactoring.
       ipc_message_sender_->SendAddUnfilteredEventListenerIPC(script_context,
                                                              event_name);
       if (is_lazy) {
         ipc_message_sender_->SendAddUnfilteredLazyEventListenerIPC(
             script_context, event_name);
       }
     } else {
       DCHECK_EQ(binding::EventListenersChanged::NO_LISTENERS, change);
       ipc_message_sender_->SendRemoveUnfilteredEventListenerIPC(script_context,
                                                                 event_name);
-      if (remove_lazy_listener) {
+      if (is_lazy) {
         ipc_message_sender_->SendRemoveUnfilteredLazyEventListenerIPC(
             script_context, event_name);
       }
     }
   }
 }
 
 void NativeExtensionBindingsSystem::GetJSBindingUtil(
     v8::Local<v8::Context> context,
     v8::Local<v8::Value>* binding_util_out) {
   gin::Handle<APIBindingJSUtil> handle = gin::CreateHandle(
       context->GetIsolate(),
       new APIBindingJSUtil(
           api_system_.type_reference_map(), api_system_.request_handler(),
           api_system_.event_handler(), api_system_.exception_handler(),
           base::Bind(&CallJsFunction)));
   *binding_util_out = handle.ToV8();
 }
 
 }  // namespace extensions