Revert 184837

Looks like it caused http://build.chromium.org/p/chromium.win/builders/Interactive%20Tests%20%28dbg%29/builds/34570

> Set up V8 bindings for extension/app APIs when they're first used, not on
> context creation. This should gives us a significant reduction in extension/app
> startup time and slightly better memory usage.
> 
> It also gives us better error messages, the chance to complete the 
> implementation of API features, and eventually the ability to expose select
> extension APIs (e.g. extension.sendMessage) to web pages.
> 
> BUG=163678,120070,55316,177163
> TBR=ben@chromium.org
> 
> Review URL: https://chromiumcodereview.appspot.com/11571014

TBR=cduvall@chromium.org
Review URL: https://codereview.chromium.org/12313142

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184860 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 8 deletions

diff --git a/chrome/renderer/extensions/chrome_v8_context.h b/chrome/renderer/extensions/chrome_v8_context.h
index e170f5c..8c71c04 100644
--- a/chrome/renderer/extensions/chrome_v8_context.h
+++ b/chrome/renderer/extensions/chrome_v8_context.h
@@ -36,10 +36,6 @@ 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_;
   }
@@ -51,6 +47,9 @@ 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,8 +100,6 @@ 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();
 
@@ -131,8 +128,7 @@ class ChromeV8Context {
   scoped_ptr<ModuleSystem> module_system_;
 
   // The extension APIs available to this context.
-  std::set<std::string> available_extension_apis_;
-  bool available_extension_apis_initialized_;
+  scoped_ptr<std::set<std::string> > available_extension_apis_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeV8Context);
 };