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

Unified Diff: chrome/test/chromedriver/chrome/chrome_desktop_impl.cc

Issue 793453002: Update chromedriver 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 | « chrome/test/chromedriver/chrome/chrome_desktop_impl.h ('k') | chrome/test/chromedriver/chrome_launcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/chromedriver/chrome/chrome_desktop_impl.cc
diff --git a/chrome/test/chromedriver/chrome/chrome_desktop_impl.cc b/chrome/test/chromedriver/chrome/chrome_desktop_impl.cc
index 65874d636f28948cb3d738756b87b446129ea465..d3b4bd21ea769bef6b70a97dd3d645621c7327f4 100644
--- a/chrome/test/chromedriver/chrome/chrome_desktop_impl.cc
+++ b/chrome/test/chromedriver/chrome/chrome_desktop_impl.cc
@@ -66,7 +66,7 @@ ChromeDesktopImpl::ChromeDesktopImpl(
scoped_ptr<DevToolsClient> websocket_client,
ScopedVector<DevToolsEventListener>& devtools_event_listeners,
scoped_ptr<PortReservation> port_reservation,
- base::ProcessHandle process,
+ base::Process process,
const CommandLine& command,
base::ScopedTempDir* user_data_dir,
base::ScopedTempDir* extension_dir)
@@ -74,7 +74,7 @@ ChromeDesktopImpl::ChromeDesktopImpl(
websocket_client.Pass(),
devtools_event_listeners,
port_reservation.Pass()),
- process_(process),
+ process_(process.Pass()),
command_(command) {
if (user_data_dir->IsValid())
CHECK(user_data_dir_.Set(user_data_dir->Take()));
@@ -94,7 +94,6 @@ ChromeDesktopImpl::~ChromeDesktopImpl() {
LOG(WARNING) << "chromedriver automation extension directory: "
<< extension_dir.value();
}
- base::CloseProcessHandle(process_);
samuong 2014/12/10 20:44:55 I'm happy either way, but should we call CloseHand
rvargas (doing something else) 2014/12/10 21:55:26 Not calling Close is the same as calling it here (
}
Status ChromeDesktopImpl::WaitForPageToLoad(const std::string& url,
@@ -169,7 +168,7 @@ bool ChromeDesktopImpl::IsMobileEmulationEnabled() const {
}
Status ChromeDesktopImpl::QuitImpl() {
- if (!KillProcess(process_))
+ if (!KillProcess(process_.Handle()))
return Status(kUnknownError, "cannot kill Chrome");
return Status(kOk);
}
« no previous file with comments | « chrome/test/chromedriver/chrome/chrome_desktop_impl.h ('k') | chrome/test/chromedriver/chrome_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698