Lazy load chrome.* APIs

chrome/renderer/extensions/api_definitions_natives.cc

Index: chrome/renderer/extensions/api_definitions_natives.cc
diff --git a/chrome/renderer/extensions/api_definitions_natives.cc b/chrome/renderer/extensions/api_definitions_natives.cc
index 1bdd767f3e3ed8ca86969d99cda7f4cbbe0c955f..85f86b333dc2f1f9081a10de0dd72a35e1efd660 100644
--- a/chrome/renderer/extensions/api_definitions_natives.cc
+++ b/chrome/renderer/extensions/api_definitions_natives.cc
@@ -12,8 +12,10 @@ const char kInvalidExtensionNamespace[] = "Invalid extension namespace";
 
 namespace extensions {
 
-ApiDefinitionsNatives::ApiDefinitionsNatives(Dispatcher* dispatcher)
-    : ChromeV8Extension(dispatcher) {
+ApiDefinitionsNatives::ApiDefinitionsNatives(Dispatcher* dispatcher,
+                                             ChromeV8Context* context)
+    : ChromeV8Extension(dispatcher, context->v8_context()),
+      context_(context) {
   RouteFunction("GetExtensionAPIDefinition",
                 base::Bind(&ApiDefinitionsNatives::GetExtensionAPIDefinition,
                            base::Unretained(this)));
@@ -21,10 +23,7 @@ ApiDefinitionsNatives::ApiDefinitionsNatives(Dispatcher* dispatcher)
 
 v8::Handle<v8::Value> ApiDefinitionsNatives::GetExtensionAPIDefinition(
     const v8::Arguments& args) {
-  ChromeV8Context* v8_context = dispatcher()->v8_context_set().GetCurrent();
-  CHECK(v8_context);
-
-  std::set<std::string> available_apis(v8_context->GetAvailableExtensionAPIs());
+  std::set<std::string> available_apis(context_->GetAvailableExtensionAPIs());
   if (args.Length() == 0)
     return dispatcher()->v8_schema_registry()->GetSchemas(available_apis);