Make ExtensionMsg_MessageInvoke run a module system function rather than a

chrome/renderer/extensions/chrome_v8_context.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_RENDERER_EXTENSIONS_CHROME_V8_CONTEXT_H_
 #define CHROME_RENDERER_EXTENSIONS_CHROME_V8_CONTEXT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 67 matching lines @@
 
   // Return the chromeHidden object associated with this context, or an empty
   // handle if no chrome hidden has been created (by GetOrCreateChromeHidden)
   // yet for this context.
   v8::Handle<v8::Value> GetChromeHidden() const;
 
   // Returns the RenderView associated with this context. Can return NULL if the
   // context is in the process of being destroyed.
   content::RenderView* GetRenderView() const;
 
+  // Runs |function| with appropriate scopes. Doesn't catch exceptions, callers
+  // must do that if they want.
+  //
+  // USE THIS METHOD RATHER THAN v8::Function::Call WHEREVER POSSIBLE.
+  v8::Local<v8::Value> CallFunction(v8::Handle<v8::Function> function,
+                                    int argc,
+                                    v8::Handle<v8::Value> argv[]) const;
+
   // Fires the onunload event on the chromeHidden object.
   void DispatchOnUnloadEvent();
 
-  // Call the named method of the chromeHidden object in this context.
-  // The function can be a sub-property like "Port.dispatchOnMessage". Returns
-  // the result of the function call in |result| if |result| is non-NULL. If the
-  // named method does not exist, returns false.
-  bool CallChromeHiddenMethod(
-      const std::string& function_name,
-      int argc,
-      v8::Handle<v8::Value>* argv,
-      v8::Handle<v8::Value>* result) const;
-
   // Returns the availability of the API |api_name|.
   Feature::Availability GetAvailability(const std::string& api_name);
 
   // Returns whether the API |api_name| or any part of the API could be
   // available in this context without taking into account the context's
   // extension.
   bool IsAnyFeatureAvailableToContext(const std::string& api_name);
 
   // Returns a string description of the type of context this is.
   std::string GetContextTypeDescription();
 
   // RequestSender::Source implementation.
   virtual ChromeV8Context* GetContext() OVERRIDE;
   virtual void OnResponseReceived(const std::string& name,
                                   int request_id,
                                   bool success,
                                   const base::ListValue& response,
                                   const std::string& error) OVERRIDE;
 
  private:
+  bool is_valid() const;
+
   // The v8 context the bindings are accessible to.
   ScopedPersistent<v8::Context> v8_context_;
 
   // The WebFrame associated with this context. This can be NULL because this
   // object can outlive is destroyed asynchronously.
   WebKit::WebFrame* web_frame_;
 
   // The extension associated with this context, or NULL if there is none. This
   // might be a hosted app in the case that this context is hosting a web URL.
   scoped_refptr<const Extension> extension_;
 
   // The type of context.
   Feature::Context context_type_;
 
   // Owns and structures the JS that is injected to set up extension bindings.
   scoped_ptr<ModuleSystem> module_system_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeV8Context);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_RENDERER_EXTENSIONS_CHROME_V8_CONTEXT_H_