Index: chrome/browser/extensions/api/dial/dial_service.cc |
diff --git a/chrome/browser/extensions/api/dial/dial_service.cc b/chrome/browser/extensions/api/dial/dial_service.cc |
index 54fbfe05d841287cf2a927e09f54d6895a8d1644..56da37ed6178c7821abe9eee397f5399384011ac 100644 |
--- a/chrome/browser/extensions/api/dial/dial_service.cc |
+++ b/chrome/browser/extensions/api/dial/dial_service.cc |
@@ -530,7 +530,7 @@ void DialServiceImpl::BindAndAddSocket(const IPAddressNumber& bind_ip_address) { |
scoped_ptr<DialServiceImpl::DialSocket> dial_socket(CreateDialSocket()); |
if (dial_socket->CreateAndBindSocket(bind_ip_address, net_log_, |
net_log_source_)) |
- dial_sockets_.push_back(dial_socket.release()); |
+ dial_sockets_.push_back(dial_socket.Pass()); |
} |
scoped_ptr<DialServiceImpl::DialSocket> DialServiceImpl::CreateDialSocket() { |
@@ -552,10 +552,8 @@ void DialServiceImpl::SendOneRequest() { |
num_requests_sent_++; |
VLOG(2) << "Sending request " << num_requests_sent_ << "/" |
<< max_requests_; |
- for (ScopedVector<DialServiceImpl::DialSocket>::iterator iter = |
- dial_sockets_.begin(); |
- iter != dial_sockets_.end(); |
- ++iter) { |
+ auto iter = dial_sockets_.begin(); |
mark a. foltz
2015/11/17 22:37:38
Can this be declared in the for() ?
Igor Vayzert
2015/11/18 03:12:56
Done.
|
+ for (; iter != dial_sockets_.end(); ++iter) { |
if (!((*iter)->IsClosed())) |
(*iter)->SendOneRequest(send_address_, send_buffer_); |
} |
@@ -618,9 +616,8 @@ void DialServiceImpl::FinishDiscovery() { |
} |
bool DialServiceImpl::HasOpenSockets() { |
- for (ScopedVector<DialSocket>::const_iterator iter = dial_sockets_.begin(); |
- iter != dial_sockets_.end(); |
- ++iter) { |
+ auto iter = dial_sockets_.begin(); |
mark a. foltz
2015/11/17 22:37:38
Ditto
Igor Vayzert
2015/11/18 03:12:56
Done.
|
+ for (; iter != dial_sockets_.end(); ++iter) { |
if (!((*iter)->IsClosed())) |
return true; |
} |