Chromium Code Reviews| Index: sandbox/linux/syscall_broker/broker_host.cc |
| diff --git a/sandbox/linux/syscall_broker/broker_host.cc b/sandbox/linux/syscall_broker/broker_host.cc |
| index 1a0568fb2f0458ecfd5567544a631808abef8406..068329192710b15a5e04ff291e0e6b5831c9ca28 100644 |
| --- a/sandbox/linux/syscall_broker/broker_host.cc |
| +++ b/sandbox/linux/syscall_broker/broker_host.cc |
| @@ -174,7 +174,7 @@ BrokerHost::~BrokerHost() { |
| // 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( |
| @@ -187,13 +187,12 @@ BrokerHost::RequestStatus BrokerHost::HandleRequest() const { |
| // 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); |