Added support for multiple parameters to Extension API callbacks.

chrome/browser/extensions/extension_function_test_utils.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_BROWSER_EXTENSIONS_EXTENSION_FUNCTION_TEST_UTILS_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_FUNCTION_TEST_UTILS_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
@@ skipping 54 matching lines @@
                                       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 takes ownership of
 // the result.
-base::Value* RunFunctionAndReturnResult(UIThreadExtensionFunction* function,
-                                        const std::string& args,
-                                        Browser* browser,
-                                        RunFunctionFlags flags);
-base::Value* RunFunctionAndReturnResult(UIThreadExtensionFunction* function,
-                                        const std::string& args,
-                                        Browser* browser);
+base::Value* RunFunctionAndReturnSingleResult(
+    UIThreadExtensionFunction* function,
+    const std::string& args,
+    Browser* browser,
+    RunFunctionFlags flags);
+base::Value* RunFunctionAndReturnSingleResult(
+    UIThreadExtensionFunction* function,
+    const std::string& args,
+    Browser* browser);
 
 // Create and run |function| with |args|. Works with both synchronous and async
 // functions.
 //
 // TODO(aa): It would be nice if |args| could be validated against the schema
 // that |function| expects. That way, we know that we are testing something
 // close to what the bindings would actually send.
 //
 // 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.
 bool RunFunction(UIThreadExtensionFunction* function,
                  const std::string& args,
                  Browser* browser,
                  RunFunctionFlags flags);
 
 } // namespace extension_function_test_utils
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_FUNCTION_TEST_UTILS_H_