Remove ScopedVector from content::ZygoteMain()

content/zygote/zygote_linux.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 "content/zygote/zygote_linux.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <poll.h>
 #include <signal.h>
@@ skipping 73 matching lines @@
 
   // Kill the child process in case it's not already dead, so we can safely
   // perform a blocking wait.
   PCHECK(0 == kill(pid, SIGKILL));
   PCHECK(pid == HANDLE_EINTR(waitpid(pid, NULL, 0)));
 }
 
 }  // namespace
 
 Zygote::Zygote(int sandbox_flags,
-               ScopedVector<ZygoteForkDelegate> helpers,
+               std::vector<std::unique_ptr<ZygoteForkDelegate>> helpers,
                const std::vector<base::ProcessHandle>& extra_children,
                const std::vector<int>& extra_fds)
     : sandbox_flags_(sandbox_flags),
       helpers_(std::move(helpers)),
       initial_uma_index_(0),
       extra_children_(extra_children),
       extra_fds_(extra_fds),
       to_reap_() {}
 
 Zygote::~Zygote() {
@@ skipping 306 matching lines @@
 }
 
 int Zygote::ForkWithRealPid(const std::string& process_type,
                             const base::GlobalDescriptors::Mapping& fd_mapping,
                             const std::string& channel_id,
                             base::ScopedFD pid_oracle,
                             std::string* uma_name,
                             int* uma_sample,
                             int* uma_boundary_value) {
   ZygoteForkDelegate* helper = NULL;
-  for (ScopedVector<ZygoteForkDelegate>::iterator i = helpers_.begin();
-       i != helpers_.end();
-       ++i) {
+  for (auto i = helpers_.begin(); i != helpers_.end(); ++i) {
     if ((*i)->CanHelp(process_type, uma_name, uma_sample, uma_boundary_value)) {
-      helper = *i;
+      helper = i->get();
       break;
     }
   }
 
   base::ScopedFD read_pipe, write_pipe;
   base::ProcessId pid = 0;
   if (helper) {
     int mojo_channel_fd = LookUpFd(fd_mapping, kMojoIPCChannel);
     if (mojo_channel_fd < 0) {
       DLOG(ERROR) << "Failed to find kMojoIPCChannel in FD mapping";
@@ skipping 229 matching lines @@
 bool Zygote::HandleGetSandboxStatus(int fd, base::PickleIterator iter) {
   if (HANDLE_EINTR(write(fd, &sandbox_flags_, sizeof(sandbox_flags_))) !=
                    sizeof(sandbox_flags_)) {
     PLOG(ERROR) << "write";
   }
 
   return false;
 }
 
 }  // namespace content