Index: chrome/test/chromedriver/session_commands.cc |
diff --git a/chrome/test/chromedriver/session_commands.cc b/chrome/test/chromedriver/session_commands.cc |
index 96aee9de5a6a5401dba3826defb9f4109fff5970..e8ea41fb673e58910d305be57fb2ed583af1405d 100644 |
--- a/chrome/test/chromedriver/session_commands.cc |
+++ b/chrome/test/chromedriver/session_commands.cc |
@@ -201,8 +201,8 @@ Status InitSessionHelper(const InitSessionParams& bound_params, |
// Create Log's and DevToolsEventListener's for ones that are DevTools-based. |
// Session will own the Log's, Chrome will own the listeners. |
// Also create |CommandListener|s for the appropriate logs. |
- ScopedVector<DevToolsEventListener> devtools_event_listeners; |
- ScopedVector<CommandListener> command_listeners; |
+ std::vector<std::unique_ptr<DevToolsEventListener>> devtools_event_listeners; |
+ std::vector<std::unique_ptr<CommandListener>> command_listeners; |
status = CreateLogs(capabilities, |
session, |
&session->devtools_logs, |
@@ -214,15 +214,12 @@ Status InitSessionHelper(const InitSessionParams& bound_params, |
// |session| will own the |CommandListener|s. |
session->command_listeners.swap(command_listeners); |
- status = LaunchChrome(bound_params.context_getter.get(), |
- bound_params.socket_factory, |
- bound_params.device_manager, |
- bound_params.port_server, |
- bound_params.port_manager, |
- capabilities, |
- &devtools_event_listeners, |
- &session->chrome, |
- session->w3c_compliant); |
+ status = |
+ LaunchChrome(bound_params.context_getter.get(), |
+ bound_params.socket_factory, bound_params.device_manager, |
+ bound_params.port_server, bound_params.port_manager, |
+ capabilities, std::move(devtools_event_listeners), |
+ &session->chrome, session->w3c_compliant); |
if (status.IsError()) |
return status; |