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

Unified Diff: chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc

Issue 789023002: Update browser/media to use the new version of LaunchProcess. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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
« no previous file with comments | « no previous file | chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc
diff --git a/chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc b/chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc
index fe56b30b669eac49f5206adefc8df5efbfd5976e..a8cc375bc0487c3acd44dd5b47e66e3132cc2909 100644
--- a/chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc
+++ b/chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc
@@ -49,10 +49,7 @@ const char kIsApprtcCallUpJavascript[] =
// 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));
@@ -66,11 +63,11 @@ class WebRtcApprtcBrowserTest : public WebRtcTestBase {
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";
}
@@ -104,8 +101,8 @@ class WebRtcApprtcBrowserTest : public WebRtcTestBase {
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() {
@@ -197,8 +194,8 @@ class WebRtcApprtcBrowserTest : public WebRtcTestBase {
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() {
@@ -218,8 +215,8 @@ class WebRtcApprtcBrowserTest : public WebRtcTestBase {
}
private:
- base::ProcessHandle dev_appserver_;
- base::ProcessHandle firefox_;
+ base::Process dev_appserver_;
+ base::Process firefox_;
};
IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, MANUAL_WorksOnApprtc) {
« no previous file with comments | « no previous file | chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698