Remove ScopedVector from extensions/api/dial.

chrome/browser/extensions/api/dial/dial_service.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/dial/dial_service.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 512 matching lines @@
        ++iter)
     BindAndAddSocket(*iter);
 
   SendOneRequest();
 }
 
 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() {
   scoped_ptr<DialServiceImpl::DialSocket> dial_socket(
       new DialServiceImpl::DialSocket(
           base::Bind(&DialServiceImpl::NotifyOnDiscoveryRequest, AsWeakPtr()),
           base::Bind(&DialServiceImpl::NotifyOnDeviceDiscovered, AsWeakPtr()),
           base::Bind(&DialServiceImpl::NotifyOnError, AsWeakPtr())));
   return dial_socket.Pass();
 }
 
 void DialServiceImpl::SendOneRequest() {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (num_requests_sent_ == max_requests_) {
     VLOG(2) << "Reached max requests; stopping request timer.";
     request_timer_.Stop();
     return;
   }
   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_);
   }
 }
 
 void DialServiceImpl::NotifyOnDiscoveryRequest() {
   DCHECK(thread_checker_.CalledOnValidThread());
   // If discovery is inactive, no reason to notify observers.
   if (!discovery_active_) {
     VLOG(2) << "Request sent after discovery finished.  Ignoring.";
@@ skipping 42 matching lines @@
   // Close all open sockets.
   dial_sockets_.clear();
   finish_timer_.Stop();
   request_timer_.Stop();
   discovery_active_ = false;
   num_requests_sent_ = 0;
   FOR_EACH_OBSERVER(Observer, observer_list_, OnDiscoveryFinished(this));
 }
 
 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;
   }
   return false;
 }
 
 }  // namespace extensions