Move the event attach/detach logic on unload from event.js to

extensions/renderer/v8_schema_registry.cc

 // Copyright 2014 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/v8_schema_registry.h"
 
 #include "base/logging.h"
 #include "base/values.h"
 #include "content/public/child/v8_value_converter.h"
 #include "extensions/common/extension_api.h"
@@ skipping 11 matching lines @@
   SchemaRegistryNativeHandler(V8SchemaRegistry* registry,
                               scoped_ptr<ScriptContext> context)
       : ObjectBackedNativeHandler(context.get()),
         context_(context.Pass()),
         registry_(registry) {
     RouteFunction("GetSchema",
                   base::Bind(&SchemaRegistryNativeHandler::GetSchema,
                              base::Unretained(this)));
   }
 
+  ~SchemaRegistryNativeHandler() override { context_->Invalidate(); }
+
  private:
   void GetSchema(const v8::FunctionCallbackInfo<v8::Value>& args) {
     args.GetReturnValue().Set(
         registry_->GetSchema(*v8::String::Utf8Value(args[0])));
   }
 
   scoped_ptr<ScriptContext> context_;
   V8SchemaRegistry* registry_;
 };
 
@@ skipping 68 matching lines @@
   if (!context_holder_) {
     context_holder_.reset(new gin::ContextHolder(isolate));
     context_holder_->SetContext(v8::Context::New(isolate));
     schema_cache_.reset(new SchemaCache(isolate));
     return context_holder_->context();
   }
   return context_holder_->context();
 }
 
 }  // namespace extensions