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

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

Issue 2777883003: Remove ScopedVector from chrome/test/chromedriver/ (Closed)
Patch Set: address nit from stgao@ Created 3 years, 9 months 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_impl.h ('k') | chrome/test/chromedriver/chrome/chrome_remote_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/chromedriver/chrome/chrome_impl.cc
diff --git a/chrome/test/chromedriver/chrome/chrome_impl.cc b/chrome/test/chromedriver/chrome/chrome_impl.cc
index 476de991a1218fc52a76d24e4d984fc2cd8c6acd..aa23744686dcdfa42e2ef9c9ad45c3e3f977064b 100644
--- a/chrome/test/chromedriver/chrome/chrome_impl.cc
+++ b/chrome/test/chromedriver/chrome/chrome_impl.cc
@@ -100,12 +100,9 @@ void ChromeImpl::UpdateWebViews(const WebViewsInfo& views_info,
if (!found) {
std::unique_ptr<DevToolsClient> client(
devtools_http_client_->CreateClient(view.id));
- for (ScopedVector<DevToolsEventListener>::const_iterator listener =
- devtools_event_listeners_.begin();
- listener != devtools_event_listeners_.end(); ++listener) {
- client->AddListener(*listener);
- // OnConnected will fire when DevToolsClient connects later.
- }
+ for (const auto& listener : devtools_event_listeners_)
+ client->AddListener(listener.get());
+ // OnConnected will fire when DevToolsClient connects later.
CHECK(!page_load_strategy_.empty());
web_views_.push_back(make_linked_ptr(new WebViewImpl(
view.id, w3c_compliant, devtools_http_client_->browser_info(),
@@ -165,16 +162,15 @@ Status ChromeImpl::Quit() {
return status;
}
-ChromeImpl::ChromeImpl(
- std::unique_ptr<DevToolsHttpClient> http_client,
- std::unique_ptr<DevToolsClient> websocket_client,
- ScopedVector<DevToolsEventListener>& devtools_event_listeners,
- std::unique_ptr<PortReservation> port_reservation,
- std::string page_load_strategy)
+ChromeImpl::ChromeImpl(std::unique_ptr<DevToolsHttpClient> http_client,
+ std::unique_ptr<DevToolsClient> websocket_client,
+ std::vector<std::unique_ptr<DevToolsEventListener>>
+ devtools_event_listeners,
+ std::unique_ptr<PortReservation> port_reservation,
+ std::string page_load_strategy)
: quit_(false),
devtools_http_client_(std::move(http_client)),
devtools_websocket_client_(std::move(websocket_client)),
+ devtools_event_listeners_(std::move(devtools_event_listeners)),
port_reservation_(std::move(port_reservation)),
- page_load_strategy_(page_load_strategy) {
- devtools_event_listeners_.swap(devtools_event_listeners);
-}
+ page_load_strategy_(page_load_strategy) {}
« no previous file with comments | « chrome/test/chromedriver/chrome/chrome_impl.h ('k') | chrome/test/chromedriver/chrome/chrome_remote_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698