| Index: extensions/renderer/js_extension_bindings_system.cc
 | 
| diff --git a/extensions/renderer/js_extension_bindings_system.cc b/extensions/renderer/js_extension_bindings_system.cc
 | 
| index 45c3500c3cfa701d8bd613095346bbdee7a0289d..72dd95776411a7c60bd337486615807488c3d3d4 100644
 | 
| --- a/extensions/renderer/js_extension_bindings_system.cc
 | 
| +++ b/extensions/renderer/js_extension_bindings_system.cc
 | 
| @@ -17,6 +17,7 @@
 | 
|  #include "extensions/common/manifest_constants.h"
 | 
|  #include "extensions/common/manifest_handlers/externally_connectable.h"
 | 
|  #include "extensions/renderer/binding_generating_native_handler.h"
 | 
| +#include "extensions/renderer/event_bindings.h"
 | 
|  #include "extensions/renderer/renderer_extension_registry.h"
 | 
|  #include "extensions/renderer/resource_bundle_source_map.h"
 | 
|  #include "extensions/renderer/script_context.h"
 | 
| @@ -27,8 +28,6 @@ namespace extensions {
 | 
|  
 | 
|  namespace {
 | 
|  
 | 
| -static const char kEventDispatchFunction[] = "dispatchEvent";
 | 
| -
 | 
|  // Gets |field| from |object| or creates it as an empty object if it doesn't
 | 
|  // exist.
 | 
|  v8::Local<v8::Object> GetOrCreateObject(const v8::Local<v8::Object>& object,
 | 
| @@ -250,26 +249,8 @@ void JsExtensionBindingsSystem::DispatchEventInContext(
 | 
|      const base::ListValue* event_args,
 | 
|      const base::DictionaryValue* filtering_info,
 | 
|      ScriptContext* context) {
 | 
| -  v8::HandleScope handle_scope(context->isolate());
 | 
| -  v8::Context::Scope context_scope(context->v8_context());
 | 
| -
 | 
| -  std::vector<v8::Local<v8::Value>> arguments;
 | 
| -  arguments.push_back(gin::StringToSymbol(context->isolate(), event_name));
 | 
| -
 | 
| -  {
 | 
| -    std::unique_ptr<content::V8ValueConverter> converter(
 | 
| -        content::V8ValueConverter::create());
 | 
| -    arguments.push_back(
 | 
| -        converter->ToV8Value(event_args, context->v8_context()));
 | 
| -    if (filtering_info && !filtering_info->empty()) {
 | 
| -      arguments.push_back(
 | 
| -          converter->ToV8Value(filtering_info, context->v8_context()));
 | 
| -    }
 | 
| -  }
 | 
| -
 | 
| -  context->module_system()->CallModuleMethodSafe(
 | 
| -      kEventBindings, kEventDispatchFunction, arguments.size(),
 | 
| -      arguments.data());
 | 
| +  EventBindings::DispatchEventInContext(event_name, event_args, filtering_info,
 | 
| +                                        context);
 | 
|  }
 | 
|  
 | 
|  void JsExtensionBindingsSystem::RegisterBinding(
 | 
| 
 |