OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/test/chromedriver/commands.h" | 5 #include "chrome/test/chromedriver/commands.h" |
6 | 6 |
7 #include <list> | 7 #include <list> |
8 | 8 |
9 #include "base/stringprintf.h" | 9 #include "base/stringprintf.h" |
10 #include "base/sys_info.h" | 10 #include "base/sys_info.h" |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
81 | 81 |
82 // Create Log's and DevToolsEventListener's for ones that are DevTools-based. | 82 // Create Log's and DevToolsEventListener's for ones that are DevTools-based. |
83 // Session will own the Log's, Chrome will own the listeners. | 83 // Session will own the Log's, Chrome will own the listeners. |
84 ScopedVector<WebDriverLog> devtools_logs; | 84 ScopedVector<WebDriverLog> devtools_logs; |
85 ScopedVector<DevToolsEventListener> devtools_event_listeners; | 85 ScopedVector<DevToolsEventListener> devtools_event_listeners; |
86 status = CreateLogs(capabilities, &devtools_logs, &devtools_event_listeners); | 86 status = CreateLogs(capabilities, &devtools_logs, &devtools_event_listeners); |
87 if (status.IsError()) | 87 if (status.IsError()) |
88 return status; | 88 return status; |
89 | 89 |
90 scoped_ptr<Chrome> chrome; | 90 scoped_ptr<Chrome> chrome; |
91 status = LaunchChrome(bound_params.context_getter, | 91 status = LaunchChrome(bound_params.context_getter.get(), |
92 port, | 92 port, |
93 bound_params.socket_factory, | 93 bound_params.socket_factory, |
94 bound_params.log, | 94 bound_params.log, |
95 bound_params.device_manager, | 95 bound_params.device_manager, |
96 capabilities, | 96 capabilities, |
97 devtools_event_listeners, | 97 devtools_event_listeners, |
98 &chrome); | 98 &chrome); |
99 if (status.IsError()) | 99 if (status.IsError()) |
100 return status; | 100 return status; |
101 | 101 |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
138 std::string* out_session_id) { | 138 std::string* out_session_id) { |
139 std::vector<std::string> session_ids; | 139 std::vector<std::string> session_ids; |
140 session_map->GetKeys(&session_ids); | 140 session_map->GetKeys(&session_ids); |
141 for (size_t i = 0; i < session_ids.size(); ++i) { | 141 for (size_t i = 0; i < session_ids.size(); ++i) { |
142 scoped_ptr<base::Value> unused_value; | 142 scoped_ptr<base::Value> unused_value; |
143 std::string unused_session_id; | 143 std::string unused_session_id; |
144 quit_command.Run(params, session_ids[i], &unused_value, &unused_session_id); | 144 quit_command.Run(params, session_ids[i], &unused_value, &unused_session_id); |
145 } | 145 } |
146 return Status(kOk); | 146 return Status(kOk); |
147 } | 147 } |
OLD | NEW |