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 4a5222591bf9d81e92e7bcb7d0a1ddc2f0eefab6..834e721c47f8d5f8cd2e31b0f6b5e54d743da6f1 100644 |
--- a/chrome/test/chromedriver/chrome/chrome_desktop_impl.cc |
+++ b/chrome/test/chromedriver/chrome/chrome_desktop_impl.cc |
@@ -5,6 +5,7 @@ |
#include "chrome/test/chromedriver/chrome/chrome_desktop_impl.h" |
#include <stddef.h> |
+#include <utility> |
#include "base/files/file_path.h" |
#include "base/logging.h" |
@@ -73,11 +74,11 @@ ChromeDesktopImpl::ChromeDesktopImpl( |
const base::CommandLine& command, |
base::ScopedTempDir* user_data_dir, |
base::ScopedTempDir* extension_dir) |
- : ChromeImpl(http_client.Pass(), |
- websocket_client.Pass(), |
+ : ChromeImpl(std::move(http_client), |
+ std::move(websocket_client), |
devtools_event_listeners, |
- port_reservation.Pass()), |
- process_(process.Pass()), |
+ std::move(port_reservation)), |
+ process_(std::move(process)), |
command_(command) { |
if (user_data_dir->IsValid()) |
CHECK(user_data_dir_.Set(user_data_dir->Take())); |
@@ -147,7 +148,7 @@ Status ChromeDesktopImpl::WaitForPageToLoad(const std::string& url, |
status = web_view_tmp->WaitForPendingNavigations( |
std::string(), deadline - base::TimeTicks::Now(), false); |
if (status.IsOk()) |
- *web_view = web_view_tmp.Pass(); |
+ *web_view = std::move(web_view_tmp); |
return status; |
} |
@@ -163,7 +164,7 @@ Status ChromeDesktopImpl::GetAutomationExtension( |
if (status.IsError()) |
return Status(kUnknownError, "cannot get automation extension", status); |
- automation_extension_.reset(new AutomationExtension(web_view.Pass())); |
+ automation_extension_.reset(new AutomationExtension(std::move(web_view))); |
} |
*extension = automation_extension_.get(); |
return Status(kOk); |