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

chrome/browser/extensions/extension_function_test_utils.h

 // Copyright (c) 2011 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_BROWSER_EXTENSIONS_EXTENSION_FUNCTION_TEST_UTILS_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_FUNCTION_TEST_UTILS_H_
 #pragma once
 
 #include <string>
 
@@ skipping 32 matching lines @@
 // before running it.
 scoped_refptr<Extension> CreateEmptyExtension();
 
 enum RunFunctionFlags {
   NONE = 0,
   INCLUDE_INCOGNITO = 1 << 0
 };
 
 // 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,
                                       RunFunctionFlags flags);
 std::string RunFunctionAndReturnError(UIThreadExtensionFunction* function,
                                       const std::string& args,
                                       Browser* browser);
 
 // Run |function| with |args| and return the result. Adds an error to the
 // current test if |function| returns an error. The caller releases ownership of
@@ skipping 16 matching lines @@
 // TODO(aa): I'm concerned that this style won't scale to all the bits and bobs
 // we're going to need to frob for all the different extension functions. But we
 // can refactor when we see what is needed.
 void RunFunction(UIThreadExtensionFunction* function,
                  const std::string& args,
                  Browser* browser,
                  RunFunctionFlags flags);
 
 // 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);
 
 } // namespace extension_function_test_utils
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_FUNCTION_TEST_UTILS_H_