Revert 184837

chrome/renderer/extensions/api_definitions_natives.cc

Index: chrome/renderer/extensions/api_definitions_natives.cc
===================================================================
--- chrome/renderer/extensions/api_definitions_natives.cc	(revision 184858)
+++ chrome/renderer/extensions/api_definitions_natives.cc	(working copy)
@@ -12,10 +12,8 @@
 
 namespace extensions {
 
-ApiDefinitionsNatives::ApiDefinitionsNatives(Dispatcher* dispatcher,
-                                             ChromeV8Context* context)
-    : ChromeV8Extension(dispatcher, context->v8_context()),
-      context_(context) {
+ApiDefinitionsNatives::ApiDefinitionsNatives(Dispatcher* dispatcher)
+    : ChromeV8Extension(dispatcher) {
   RouteFunction("GetExtensionAPIDefinition",
                 base::Bind(&ApiDefinitionsNatives::GetExtensionAPIDefinition,
                            base::Unretained(this)));
@@ -23,7 +21,10 @@
 
 v8::Handle<v8::Value> ApiDefinitionsNatives::GetExtensionAPIDefinition(
     const v8::Arguments& args) {
-  std::set<std::string> available_apis(context_->GetAvailableExtensionAPIs());
+  ChromeV8Context* v8_context = dispatcher()->v8_context_set().GetCurrent();
+  CHECK(v8_context);
+
+  std::set<std::string> available_apis(v8_context->GetAvailableExtensionAPIs());
   if (args.Length() == 0)
     return dispatcher()->v8_schema_registry()->GetSchemas(available_apis);