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

Unified Diff: base/process_util_unittest.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
Index: base/process_util_unittest.cc
diff --git a/base/process_util_unittest.cc b/base/process_util_unittest.cc
index 45ecdbb54c472b5da5aedd5fc4e01b3ff4522b2a..6c7dc88697579f703f9c6fe8978112081c43b8ab 100644
--- a/base/process_util_unittest.cc
+++ b/base/process_util_unittest.cc
@@ -119,7 +119,7 @@ class ProcessUtilTest : public base::MultiProcessTest {
#endif
};
-MULTIPROCESS_TEST_MAIN(SimpleChildProcess) {
+MULTIPROCESS_TEST_MAIN(SimpleChildProcess, NULL) {
return 0;
}
@@ -131,7 +131,7 @@ TEST_F(ProcessUtilTest, SpawnChild) {
base::CloseProcessHandle(handle);
}
-MULTIPROCESS_TEST_MAIN(SlowChildProcess) {
+MULTIPROCESS_TEST_MAIN(SlowChildProcess, NULL) {
WaitToDie(kSignalFileSlow);
return 0;
}
@@ -211,7 +211,7 @@ TEST_F(ProcessUtilTest, GetModuleFromAddress) {
// with no symbols (instead of using the multiprocess testing
// framework) to reduce the ReportCrash overhead.
-MULTIPROCESS_TEST_MAIN(CrashingChildProcess) {
+MULTIPROCESS_TEST_MAIN(CrashingChildProcess, NULL) {
WaitToDie(kSignalFileCrash);
#if defined(OS_POSIX)
// Have to disable to signal handler for segv so we can get a crash
@@ -264,7 +264,7 @@ TEST_F(ProcessUtilTest, MAYBE_GetTerminationStatusCrash) {
}
#endif // !defined(OS_MACOSX)
-MULTIPROCESS_TEST_MAIN(KilledChildProcess) {
+MULTIPROCESS_TEST_MAIN(KilledChildProcess, NULL) {
WaitToDie(kSignalFileKill);
#if defined(OS_WIN)
// Kill ourselves.
@@ -522,7 +522,7 @@ const int kChildPipe = 20; // FD # for write end of pipe in child process.
} // namespace
-MULTIPROCESS_TEST_MAIN(ProcessUtilsLeakFDChildProcess) {
+MULTIPROCESS_TEST_MAIN(ProcessUtilsLeakFDChildProcess, NULL) {
// This child process counts the number of open FDs, it then writes that
// number out to a pipe connected to the parent.
int num_open_files = 0;
@@ -915,7 +915,7 @@ TEST_F(ProcessUtilTest, DelayedTermination) {
base::CloseProcessHandle(child_process);
}
-MULTIPROCESS_TEST_MAIN(process_util_test_never_die) {
+MULTIPROCESS_TEST_MAIN(process_util_test_never_die, NULL) {
while (1) {
sleep(500);
}
@@ -935,7 +935,7 @@ TEST_F(ProcessUtilTest, ImmediateTermination) {
base::CloseProcessHandle(child_process);
}
-MULTIPROCESS_TEST_MAIN(process_util_test_die_immediately) {
+MULTIPROCESS_TEST_MAIN(process_util_test_die_immediately, NULL) {
return 0;
}

Powered by Google App Engine
This is Rietveld 408576698