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); |
} |