Refactor to allow same code to test both sync and async functions.

chrome/browser/extensions/extension_function_test_utils.h

Index: chrome/browser/extensions/extension_function_test_utils.h
diff --git a/chrome/browser/extensions/extension_function_test_utils.h b/chrome/browser/extensions/extension_function_test_utils.h
index ef005a4dd3b277a340db28037ab7918d99ff1168..6ec21fa18ac1971517b2529412565428e9c6c08b 100644
--- a/chrome/browser/extensions/extension_function_test_utils.h
+++ b/chrome/browser/extensions/extension_function_test_utils.h
@@ -51,6 +51,9 @@ enum RunFunctionFlags {
 // Run |function| with |args| and return the resulting error. Adds an error to
 // the current test if |function| returns a result. The caller releases
 // ownership of |function|.

[asargent_no_longer_on_chrome, 2011/11/18 23:08:18]

nit: remove this line about caller releasing ownership, since that contradicts
the sentence you added. And thinking about it a little more, this wasn't even
true becuse UIThreadExtensionFunction is ref-counted, so all we do is addref
while we're using the function (via a scoped_refptr), and don't really care if
anyone else has a reference or not as long as they aren't doing things like
calling methods on it while we are.

+//
+// For these and all Run* methods, the caller must hold a reference to
+// the function during the lifetime of the method.
 std::string RunFunctionAndReturnError(UIThreadExtensionFunction* function,
                                       const std::string& args,
                                       Browser* browser,
@@ -87,7 +90,9 @@ void RunFunction(UIThreadExtensionFunction* function,
 
 // Similar to RunFunction, but doesn't return until |function| calls
 // SendResponse. Returns the value |function| passed to SendResponse.
-bool RunAsyncFunction(AsyncExtensionFunction* function,
+//
+// See above re holding reference.
+bool RunAsyncFunction(UIThreadExtensionFunction* function,

[asargent_no_longer_on_chrome, 2011/11/18 23:08:18]

I thought Aaron's idea was that we want to get rid of the distinction between
RunFunction and RunAsyncFunction, and just have RunFunction.

                       const std::string& args,
                       Browser* browser,
                       RunFunctionFlags flags);