Replace ScopedVector<ScopedFD> with std::vector<ScopedFD>

sandbox/linux/syscall_broker/broker_host.cc

 // Copyright 2014 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 "sandbox/linux/syscall_broker/broker_host.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
@@ skipping 156 matching lines @@
     : broker_policy_(broker_policy), ipc_channel_(std::move(ipc_channel)) {}
 
 BrokerHost::~BrokerHost() {
 }
 
 // Handle a request on the IPC channel ipc_channel_.
 // A request should have a file descriptor attached on which we will reply and
 // that we will then close.
 // A request should start with an int that will be used as the command type.
 BrokerHost::RequestStatus BrokerHost::HandleRequest() const {
-  ScopedVector<base::ScopedFD> fds;
+  std::vector<base::ScopedFD> fds;
   char buf[kMaxMessageLength];
   errno = 0;
   const ssize_t msg_len = base::UnixDomainSocket::RecvMsg(
       ipc_channel_.get(), buf, sizeof(buf), &fds);
 
   if (msg_len == 0 || (msg_len == -1 && errno == ECONNRESET)) {
     // EOF from the client, or the client died, we should die.
     return RequestStatus::LOST_CLIENT;
   }
 
   // The client should send exactly one file descriptor, on which we
   // will write the reply.
-  // TODO(mdempsky): ScopedVector doesn't have 'at()', only 'operator[]'.
-  if (msg_len < 0 || fds.size() != 1 || fds[0]->get() < 0) {
+  if (msg_len < 0 || fds.size() != 1 || fds.at(0).get() < 0) {

[danakj, 2015/12/08 23:44:48]

ditto about these at()s

[mdempsky, 2015/12/09 00:45:37]

Reverted.

     PLOG(ERROR) << "Error reading message from the client";
     return RequestStatus::FAILURE;
   }
 
-  base::ScopedFD temporary_ipc(std::move(*fds[0]));
+  base::ScopedFD temporary_ipc(std::move(fds.at(0)));
 
   base::Pickle pickle(buf, msg_len);
   base::PickleIterator iter(pickle);
   int command_type;
   if (iter.ReadInt(&command_type)) {
     bool command_handled = false;
     // Go through all the possible IPC messages.
     switch (command_type) {
       case COMMAND_ACCESS:
       case COMMAND_OPEN:
@@ skipping 16 matching lines @@
     NOTREACHED();
   }
 
   LOG(ERROR) << "Error parsing IPC request";
   return RequestStatus::FAILURE;
 }
 
 }  // namespace syscall_broker
 
 }  // namespace sandbox