Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2298)

Unified Diff: extensions/browser/api_test_utils.h

Issue 1968083004: Implement the private API for quick unlock. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Move to base::Callback, adjust api_test_utils api, address comments Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/browser/api_test_utils.h
diff --git a/extensions/browser/api_test_utils.h b/extensions/browser/api_test_utils.h
index 81d57a801fc6d4a4f3ea962c71814c31d92c0663..81c36f42b4b31b704e8d7ffca71e2cd2025ad420 100644
--- a/extensions/browser/api_test_utils.h
+++ b/extensions/browser/api_test_utils.h
@@ -65,25 +65,31 @@ scoped_refptr<extensions::Extension> CreateEmptyExtensionWithLocation(
// Run |function| with |args| and return the result. Adds an error to the
// current test if |function| returns an error. Takes ownership of
// |function|. The caller takes ownership of the result.
-base::Value* RunFunctionWithDelegateAndReturnSingleResult(
- UIThreadExtensionFunction* function,
+std::unique_ptr<base::Value> RunFunctionWithDelegateAndReturnSingleResult(
Devlin 2016/06/21 00:16:46 Nice! Thanks for doing this :)
+ scoped_refptr<UIThreadExtensionFunction> function,
const std::string& args,
content::BrowserContext* context,
std::unique_ptr<ExtensionFunctionDispatcher> dispatcher);
-base::Value* RunFunctionWithDelegateAndReturnSingleResult(
- UIThreadExtensionFunction* function,
+std::unique_ptr<base::Value> RunFunctionWithDelegateAndReturnSingleResult(
+ scoped_refptr<UIThreadExtensionFunction> function,
const std::string& args,
content::BrowserContext* context,
std::unique_ptr<ExtensionFunctionDispatcher> dispatcher,
RunFunctionFlags flags);
+std::unique_ptr<base::Value> RunFunctionWithDelegateAndReturnSingleResult(
+ scoped_refptr<UIThreadExtensionFunction> function,
+ std::unique_ptr<base::ListValue> args,
+ content::BrowserContext* context,
+ std::unique_ptr<ExtensionFunctionDispatcher> dispatcher,
+ RunFunctionFlags flags);
// RunFunctionWithDelegateAndReturnSingleResult, except with a NULL
// implementation of the Delegate.
-base::Value* RunFunctionAndReturnSingleResult(
+std::unique_ptr<base::Value> RunFunctionAndReturnSingleResult(
UIThreadExtensionFunction* function,
const std::string& args,
content::BrowserContext* context);
-base::Value* RunFunctionAndReturnSingleResult(
+std::unique_ptr<base::Value> RunFunctionAndReturnSingleResult(
UIThreadExtensionFunction* function,
const std::string& args,
content::BrowserContext* context,

Powered by Google App Engine
This is Rietveld 408576698