Reland r103624 - Add ExtensionFunctionTest base class and a test

for GetWindowFunction using it.

Review URL: http://codereview.chromium.org/8098023

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

1 files changed, 6 insertions, 3 deletions

diff --git a/chrome/browser/extensions/extension_function.h b/chrome/browser/extensions/extension_function.h
index f0bef3a..b006fd8 100644
--- a/chrome/browser/extensions/extension_function.h
+++ b/chrome/browser/extensions/extension_function.h
@@ -91,6 +91,9 @@ class ExtensionFunction
   // be empty).
   virtual const std::string GetResult();
 
+  // Retrieves the results of the function as a Value.
+  base::Value* GetResultValue();
+
   // Retrieves any error string from the function.
   virtual const std::string GetError();
 
@@ -98,8 +101,8 @@ class ExtensionFunction
   void set_name(const std::string& name) { name_ = name; }
   const std::string& name() const { return name_; }
 
-  void set_profile(void* profile) { profile_ = profile; }
-  void* profile() const { return profile_; }
+  void set_profile_id(void* profile_id) { profile_id_ = profile_id; }
+  void* profile_id() const { return profile_id_; }
 
   void set_extension(const Extension* extension) { extension_ = extension; }
   const Extension* GetExtension() const { return extension_.get(); }
@@ -155,7 +158,7 @@ class ExtensionFunction
   int request_id_;
 
   // The Profile of this function's extension.
-  void* profile_;
+  void* profile_id_;
 
   // The extension that called this function.
   scoped_refptr<const Extension> extension_;