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

Unified Diff: extensions/browser/api_test_utils.h

Issue 449303002: Move SocketsTcpApiTest.SocketsTcpCreateGood to app_shell_browsertests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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 119b090cdee7d47663d125241ec2b0e34ead30a0..e60bb2aceb7402101c56496151e8b4f2d13ea2f3 100644
--- a/extensions/browser/api_test_utils.h
+++ b/extensions/browser/api_test_utils.h
@@ -7,7 +7,9 @@
#include <string>
+#include "base/memory/ref_counted.h"
Yoyo Zhou 2014/08/08 20:12:07 These new headers don't seem necessary.
Daniel Nishi 2014/08/08 20:30:26 Whoops. You are correct.
#include "base/memory/scoped_ptr.h"
+#include "extensions/common/extension.h"
class UIThreadExtensionFunction;
@@ -31,18 +33,30 @@ enum RunFunctionFlags { NONE = 0, INCLUDE_INCOGNITO = 1 << 0 };
// 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* RunFunctionAndReturnSingleResult(
+base::Value* RunFunctionWithDelegateAndReturnSingleResult(
UIThreadExtensionFunction* function,
const std::string& args,
content::BrowserContext* context,
scoped_ptr<ExtensionFunctionDispatcher> dispatcher);
-base::Value* RunFunctionAndReturnSingleResult(
+base::Value* RunFunctionWithDelegateAndReturnSingleResult(
UIThreadExtensionFunction* function,
const std::string& args,
content::BrowserContext* context,
scoped_ptr<ExtensionFunctionDispatcher> dispatcher,
RunFunctionFlags flags);
+// RunFunctionAndReturnSingleResult, except with a NULL implementation of the
Yoyo Zhou 2014/08/08 20:12:07 This comment needs rewriting.
Daniel Nishi 2014/08/08 20:30:26 Done.
+// Delegate.
+base::Value* RunFunctionAndReturnSingleResult(
+ UIThreadExtensionFunction* function,
+ const std::string& args,
+ content::BrowserContext* context);
+base::Value* RunFunctionAndReturnSingleResult(
+ UIThreadExtensionFunction* function,
+ const std::string& args,
+ content::BrowserContext* context,
+ RunFunctionFlags flags);
+
// Create and run |function| with |args|. Works with both synchronous and async
// functions. Ownership of |function| remains with the caller.
//

Powered by Google App Engine
This is Rietveld 408576698