summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_function_test_utils.h
diff options
context:
space:
mode:
authormtytel@chromium.org <mtytel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-12 22:39:09 +0000
committermtytel@chromium.org <mtytel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-12 22:39:09 +0000
commit07ff5fdb0c27afeed02cec68d42c49c4d694d521 (patch)
tree9c616ed2d25f1284716fd193999943fb24ae4cb2 /chrome/browser/extensions/extension_function_test_utils.h
parentb8da3c2d5cb4399505bd3e8cd05a00c588c1e45f (diff)
downloadchromium_src-07ff5fdb0c27afeed02cec68d42c49c4d694d521.zip
chromium_src-07ff5fdb0c27afeed02cec68d42c49c4d694d521.tar.gz
chromium_src-07ff5fdb0c27afeed02cec68d42c49c4d694d521.tar.bz2
Added support for multiple parameters to Extension API callbacks.
BUG=135269 TEST= Review URL: https://chromiumcodereview.appspot.com/10694106 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146469 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_function_test_utils.h')
-rw-r--r--chrome/browser/extensions/extension_function_test_utils.h16
1 files changed, 9 insertions, 7 deletions
diff --git a/chrome/browser/extensions/extension_function_test_utils.h b/chrome/browser/extensions/extension_function_test_utils.h
index 9712b94..7bcf84d 100644
--- a/chrome/browser/extensions/extension_function_test_utils.h
+++ b/chrome/browser/extensions/extension_function_test_utils.h
@@ -72,13 +72,15 @@ std::string RunFunctionAndReturnError(UIThreadExtensionFunction* function,
// 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.