Update browser/media to use the new version of LaunchProcess.

chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc

 // Copyright 2013 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.
 
 #include "base/command_line.h"
 #include "base/files/file_enumerator.h"
 #include "base/path_service.h"
 #include "base/process/launch.h"
 #include "base/rand_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 31 matching lines @@
 // WebRTC-AppRTC integration test. Requires a real webcam and microphone
 // on the running system. This test is not meant to run in the main browser
 // test suite since normal tester machines do not have webcams. Chrome will use
 // its fake camera for both tests, but Firefox will use the real webcam in the
 // Firefox interop test. Thus, this test must on a machine with a real webcam.
 //
 // This test will bring up a AppRTC instance on localhost and verify that the
 // call gets up when connecting to the same room from two tabs in a browser.
 class WebRtcApprtcBrowserTest : public WebRtcTestBase {
  public:
-  WebRtcApprtcBrowserTest()
-      : dev_appserver_(base::kNullProcessHandle),
-        firefox_(base::kNullProcessHandle) {
-  }
+  WebRtcApprtcBrowserTest() {}
 
   void SetUpCommandLine(CommandLine* command_line) override {
     EXPECT_FALSE(command_line->HasSwitch(switches::kUseFakeUIForMediaStream));
 
     // The video playback will not work without a GPU, so force its use here.
     command_line->AppendSwitch(switches::kUseGpuInTests);
     CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kUseFakeDeviceForMediaStream);
   }
 
   void TearDown() override {
     // Kill any processes we may have brought up.
     LOG(INFO) << "Entering TearDown";
-    if (dev_appserver_ != base::kNullProcessHandle)
-      base::KillProcess(dev_appserver_, 0, false);
+    if (dev_appserver_.IsValid())
+      base::KillProcess(dev_appserver_.Handle(), 0, false);
     // TODO(phoglund): Find some way to shut down Firefox cleanly on Windows.
-    if (firefox_ != base::kNullProcessHandle)
-      base::KillProcess(firefox_, 0, false);
+    if (firefox_.IsValid())
+      base::KillProcess(firefox_.Handle(), 0, false);
     LOG(INFO) << "Exiting TearDown";
   }
 
  protected:
   bool LaunchApprtcInstanceOnLocalhost() {
     base::FilePath appengine_dev_appserver =
         GetSourceDir().Append(
             FILE_PATH_LITERAL("../google_appengine/dev_appserver.py"));
     if (!base::PathExists(appengine_dev_appserver)) {
       LOG(ERROR) << "Missing appengine sdk at " <<
@@ skipping 13 matching lines @@
     EXPECT_TRUE(GetPythonCommand(&command_line));
 
     command_line.AppendArgPath(appengine_dev_appserver);
     command_line.AppendArgPath(apprtc_dir);
     command_line.AppendArg("--port=9999");
     command_line.AppendArg("--admin_port=9998");
     command_line.AppendArg("--skip_sdk_update_check");
     command_line.AppendArg("--clear_datastore=yes");
 
     DVLOG(1) << "Running " << command_line.GetCommandLineString();
-    return base::LaunchProcess(command_line, base::LaunchOptions(),
-                               &dev_appserver_);
+    dev_appserver_ = base::LaunchProcess(command_line, base::LaunchOptions());
+    return dev_appserver_.IsValid();
   }
 
   bool LocalApprtcInstanceIsUp() {
     // Load the admin page and see if we manage to load it right.
     ui_test_utils::NavigateToURL(browser(), GURL("localhost:9998"));
     content::WebContents* tab_contents =
         browser()->tab_strip_model()->GetActiveWebContents();
     std::string javascript =
         "window.domAutomationController.send(document.title)";
     std::string result;
@@ skipping 71 matching lines @@
       LOG(ERROR) << "Missing firefox launcher at " <<
           firefox_launcher.value() << ". " << kAdviseOnGclientSolution;
       return false;
     }
 
     CommandLine command_line(firefox_launcher);
     command_line.AppendSwitchPath("--binary", firefox_binary);
     command_line.AppendSwitchASCII("--webpage", url.spec());
 
     DVLOG(1) << "Running " << command_line.GetCommandLineString();
-    return base::LaunchProcess(command_line, base::LaunchOptions(),
-                               &firefox_);
+    firefox_ = base::LaunchProcess(command_line, base::LaunchOptions());
+    return firefox_.IsValid();
   }
 
   bool HasWebcamOnSystem() {
 #if defined(OS_LINUX)
     // Implementation note: normally we would be able to figure this out with
     // MediaStreamTrack.getSources, but we can't ask Chrome since it runs in
     // fake device mode where it will not enumerate webcams on the system.
     // Therefore, look for /dev/video* entries directly since this test only
     // runs on Linux for now anyway.
     base::FileEnumerator dev_video(base::FilePath(FILE_PATH_LITERAL("/dev")),
                                    false, base::FileEnumerator::FILES,
                                    FILE_PATH_LITERAL("video*"));
     return !dev_video.Next().empty();
 #endif
     NOTREACHED();
     return false;
   }
 
  private:
-  base::ProcessHandle dev_appserver_;
-  base::ProcessHandle firefox_;
+  base::Process dev_appserver_;
+  base::Process firefox_;
 };
 
 IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, MANUAL_WorksOnApprtc) {
   // Disabled on Win XP: http://code.google.com/p/webrtc/issues/detail?id=2703.
   if (OnWinXp())
     return;
 
   DetectErrorsInJavaScript();
   ASSERT_TRUE(LaunchApprtcInstanceOnLocalhost());
   while (!LocalApprtcInstanceIsUp())
@@ skipping 45 matching lines @@
       "http://localhost:9999?r=some_room_id&firefox_fake_device=1");
   content::WebContents* chrome_tab = OpenPageAndAcceptUserMedia(room_url);
 
   ASSERT_TRUE(LaunchFirefoxWithUrl(room_url));
 
   ASSERT_TRUE(WaitForCallToComeUp(chrome_tab));
 
   // Ensure Firefox manages to send video our way.
   ASSERT_TRUE(DetectRemoteVideoPlaying(chrome_tab));
 }