Lazy load chrome.* APIs

chrome/renderer/extensions/chrome_v8_context.h

Index: chrome/renderer/extensions/chrome_v8_context.h
diff --git a/chrome/renderer/extensions/chrome_v8_context.h b/chrome/renderer/extensions/chrome_v8_context.h
index d541e2c42162fc6fc28c3d8646d1d93d1549299d..83142d02ac130b17a8bbddaf01933c227d81e4f0 100644
--- a/chrome/renderer/extensions/chrome_v8_context.h
+++ b/chrome/renderer/extensions/chrome_v8_context.h
@@ -37,6 +37,10 @@ class ChromeV8Context {
                   Feature::Context context_type);
   ~ChromeV8Context();
 
+  // Clears the WebFrame for this contexts and invalidates the associated
+  // ModuleSystem.
+  void Invalidate();
+
   v8::Handle<v8::Context> v8_context() const {
     return v8_context_.get();
   }
@@ -48,9 +52,6 @@ class ChromeV8Context {
   WebKit::WebFrame* web_frame() const {
     return web_frame_;
   }
-  void clear_web_frame() {
-    web_frame_ = NULL;
-  }
 
   Feature::Context context_type() const {
     return context_type_;
@@ -101,6 +102,8 @@ class ChromeV8Context {
   // APIs are available, returns an empty set.
   const std::set<std::string>& GetAvailableExtensionAPIs();
 
+  Feature::Availability GetAvailability(const std::string& api_name);
+
   // Returns a string description of the type of context this is.
   std::string GetContextTypeDescription();
 
@@ -123,7 +126,8 @@ class ChromeV8Context {
   scoped_ptr<ModuleSystem> module_system_;
 
   // The extension APIs available to this context.
-  scoped_ptr<std::set<std::string> > available_extension_apis_;
+  std::set<std::string> available_extension_apis_;
+  bool available_extension_apis_initialized_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeV8Context);
 };