Clean up users of a deprecated base::LaunchApp API.

base/process_util_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #define _CRT_SECURE_NO_WARNINGS
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/eintr_wrapper.h"
@@ skipping 477 matching lines @@
   ret = HANDLE_EINTR(close(sockets[0]));
   DPCHECK(ret == 0);
   ret = HANDLE_EINTR(close(sockets[1]));
   DPCHECK(ret == 0);
   ret = HANDLE_EINTR(close(dev_null));
   DPCHECK(ret == 0);
 }
 
 namespace {
 
-std::string TestLaunchApp(const base::environment_vector& env_changes) {
+std::string TestLaunchProcess(const base::environment_vector& env_changes) {
   std::vector<std::string> args;
   base::file_handle_mapping_vector fds_to_remap;
-  base::ProcessHandle handle;
 
   args.push_back("bash");
   args.push_back("-c");
   args.push_back("echo $BASE_TEST");
 
   int fds[2];
   PCHECK(pipe(fds) == 0);
 
   fds_to_remap.push_back(std::make_pair(fds[1], 1));
-  EXPECT_TRUE(base::LaunchApp(args, env_changes, fds_to_remap,
-                              true /* wait for exit */, &handle));
+  base::LaunchOptions options;
+  options.wait = true;
+  options.environ = &env_changes;
+  options.fds_to_remap = &fds_to_remap;
+  EXPECT_TRUE(base::LaunchProcess(args, options));
   PCHECK(HANDLE_EINTR(close(fds[1])) == 0);
 
   char buf[512];
   const ssize_t n = HANDLE_EINTR(read(fds[0], buf, sizeof(buf)));
   PCHECK(n > 0);
 
   PCHECK(HANDLE_EINTR(close(fds[0])) == 0);
 
   return std::string(buf, n);
 }
 
 const char kLargeString[] =
     "0123456789012345678901234567890123456789012345678901234567890123456789"
     "0123456789012345678901234567890123456789012345678901234567890123456789"
     "0123456789012345678901234567890123456789012345678901234567890123456789"
     "0123456789012345678901234567890123456789012345678901234567890123456789"
     "0123456789012345678901234567890123456789012345678901234567890123456789"
     "0123456789012345678901234567890123456789012345678901234567890123456789"
     "0123456789012345678901234567890123456789012345678901234567890123456789";
 
 }  // namespace
 
-TEST_F(ProcessUtilTest, LaunchApp) {
+TEST_F(ProcessUtilTest, LaunchProcess) {
   base::environment_vector env_changes;
 
   env_changes.push_back(std::make_pair(std::string("BASE_TEST"),
                                        std::string("bar")));
-  EXPECT_EQ("bar\n", TestLaunchApp(env_changes));
+  EXPECT_EQ("bar\n", TestLaunchProcess(env_changes));
   env_changes.clear();
 
   EXPECT_EQ(0, setenv("BASE_TEST", "testing", 1 /* override */));
-  EXPECT_EQ("testing\n", TestLaunchApp(env_changes));
+  EXPECT_EQ("testing\n", TestLaunchProcess(env_changes));
 
   env_changes.push_back(std::make_pair(std::string("BASE_TEST"),
                                        std::string("")));
-  EXPECT_EQ("\n", TestLaunchApp(env_changes));
+  EXPECT_EQ("\n", TestLaunchProcess(env_changes));
 
   env_changes[0].second = "foo";
-  EXPECT_EQ("foo\n", TestLaunchApp(env_changes));
+  EXPECT_EQ("foo\n", TestLaunchProcess(env_changes));
 
   env_changes.clear();
   EXPECT_EQ(0, setenv("BASE_TEST", kLargeString, 1 /* override */));
-  EXPECT_EQ(std::string(kLargeString) + "\n", TestLaunchApp(env_changes));
+  EXPECT_EQ(std::string(kLargeString) + "\n", TestLaunchProcess(env_changes));
 
   env_changes.push_back(std::make_pair(std::string("BASE_TEST"),
                                        std::string("wibble")));
-  EXPECT_EQ("wibble\n", TestLaunchApp(env_changes));
+  EXPECT_EQ("wibble\n", TestLaunchProcess(env_changes));
 }
 
 TEST_F(ProcessUtilTest, AlterEnvironment) {
   const char* const empty[] = { NULL };
   const char* const a2[] = { "A=2", NULL };
   base::environment_vector changes;
   char** e;
 
   e = base::AlterEnvironment(changes, empty);
   EXPECT_TRUE(e[0] == NULL);
@@ skipping 413 matching lines @@
   ASSERT_DEATH({
       SetUpInDeathAssert();
       while ((value_ = base::AllocatePsychoticallyBigObjCObject())) {}
     }, "");
 }
 
 #endif  // !ARCH_CPU_64_BITS
 #endif  // OS_MACOSX
 
 #endif  // !defined(OS_WIN)