Remove ScopedVector from content::ZygoteMain()

components/nacl/zygote/nacl_fork_delegate_linux.cc

Index: components/nacl/zygote/nacl_fork_delegate_linux.cc
diff --git a/components/nacl/zygote/nacl_fork_delegate_linux.cc b/components/nacl/zygote/nacl_fork_delegate_linux.cc
index b1b39eccd32c26b9579a8567adada4fb0b4482e7..40e3a53079c22feded1a0a8b6e1ade9d31768b46 100644
--- a/components/nacl/zygote/nacl_fork_delegate_linux.cc
+++ b/components/nacl/zygote/nacl_fork_delegate_linux.cc
@@ -10,7 +10,6 @@
 #include <sys/resource.h>
 #include <sys/socket.h>
 
-#include <memory>
 #include <set>
 
 #include "base/command_line.h"
@@ -19,7 +18,7 @@
 #include "base/files/scoped_file.h"
 #include "base/logging.h"
 #include "base/macros.h"
-#include "base/memory/scoped_vector.h"
+#include "base/memory/ptr_util.h"
 #include "base/path_service.h"
 #include "base/pickle.h"
 #include "base/posix/eintr_wrapper.h"
@@ -131,9 +130,11 @@ bool SendIPCRequestAndReadReply(int ipc_channel,
 namespace nacl {
 
 void AddNaClZygoteForkDelegates(
-    ScopedVector<content::ZygoteForkDelegate>* delegates) {
-  delegates->push_back(new NaClForkDelegate(false /* nonsfi_mode */));
-  delegates->push_back(new NaClForkDelegate(true /* nonsfi_mode */));
+    std::vector<std::unique_ptr<content::ZygoteForkDelegate>>* delegates) {
+  delegates->push_back(
+      base::MakeUnique<NaClForkDelegate>(false /* nonsfi_mode */));
+  delegates->push_back(
+      base::MakeUnique<NaClForkDelegate>(true /* nonsfi_mode */));
 }
 
 NaClForkDelegate::NaClForkDelegate(bool nonsfi_mode)