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

Unified Diff: chrome/common/service_process_util_unittest.cc

Issue 2733323002: Changing multiprocess test SpawnChild to return a struct. (Closed)
Patch Set: Fixed bots. Created 3 years, 9 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: chrome/common/service_process_util_unittest.cc
diff --git a/chrome/common/service_process_util_unittest.cc b/chrome/common/service_process_util_unittest.cc
index 41a0c0e39a15030e0b9479166b906379195320d6..799ddd495eeb1922d85af132c014a5a8281d95f4 100644
--- a/chrome/common/service_process_util_unittest.cc
+++ b/chrome/common/service_process_util_unittest.cc
@@ -101,7 +101,8 @@ void ServiceProcessStateTest::SetUp() {
}
void ServiceProcessStateTest::LaunchAndWait(const std::string& name) {
- base::Process process = SpawnChild(name);
+ base::SpawnChildResult spawn_result = SpawnChild(name);
+ base::Process process(std::move(spawn_result.process));
ASSERT_TRUE(process.IsValid());
int exit_code = 0;
ASSERT_TRUE(process.WaitForExit(&exit_code));
@@ -195,7 +196,9 @@ TEST_F(ServiceProcessStateTest, DISABLED_SharedMem) {
}
TEST_F(ServiceProcessStateTest, MAYBE_ForceShutdown) {
- base::Process process = SpawnChild("ServiceProcessStateTestShutdown");
+ base::SpawnChildResult spawn_result =
+ SpawnChild("ServiceProcessStateTestShutdown");
+ base::Process process(std::move(spawn_result.process));
ASSERT_TRUE(process.IsValid());
for (int i = 0; !CheckServiceProcessReady() && i < 10; ++i) {
base::PlatformThread::Sleep(TestTimeouts::tiny_timeout());

Powered by Google App Engine
This is Rietveld 408576698