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

Unified Diff: testing/multiprocess_func_list.cc

Issue 10387218: Make GlobalDescriptors::MaybeGet return -1 when the key is not found. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Modifying the MULTIPROCESS_TEST_MAIN macro so it can be passed a setup method. Created 8 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
« testing/multiprocess_func_list.h ('K') | « testing/multiprocess_func_list.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/multiprocess_func_list.cc
diff --git a/testing/multiprocess_func_list.cc b/testing/multiprocess_func_list.cc
index 1e19704830f37ba9778aeffd48dcb30d3ada4527..04c143d9e67f193d7c3a45bd657377b229e104d8 100644
--- a/testing/multiprocess_func_list.cc
+++ b/testing/multiprocess_func_list.cc
@@ -22,9 +22,13 @@ MultiProcessTestMap &GetMultiprocessFuncMap() {
} // namespace
-AppendMultiProcessTest::AppendMultiProcessTest(std::string test_name,
- ChildFunctionPtr func_ptr) {
- GetMultiprocessFuncMap()[test_name] = func_ptr;
+AppendMultiProcessTest::AppendMultiProcessTest(
+ std::string test_name,
+ ChildFunctionPtr main_func_ptr,
+ ChildFunctionPtr setup_func_ptr) {
+ if (setup_func_ptr)
+ (*setup_func_ptr)();
+ GetMultiprocessFuncMap()[test_name] = main_func_ptr;
}
int InvokeChildProcessTest(std::string test_name) {
« testing/multiprocess_func_list.h ('K') | « testing/multiprocess_func_list.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698