Remove ScopedVector from chrome/

chrome/common/safe_browsing/mach_o_image_reader_mac.cc

 // Copyright 2015 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/common/safe_browsing/mach_o_image_reader_mac.h"
 
 #include <libkern/OSByteOrder.h>
 #include <mach-o/fat.h>
 #include <mach-o/loader.h>
 
 #include "base/logging.h"
+#include "base/memory/ptr_util.h"
 #include "base/numerics/safe_math.h"
 
 namespace safe_browsing {
 
 // ByteSlice is a bounds-checking view of an arbitrary byte array.
 class ByteSlice {
  public:
   // Creates an invalid byte slice.
   ByteSlice() : ByteSlice(nullptr, 0) {}
 
@@ skipping 104 matching lines @@
 
       // Cannot refer back to headers of previous arches to cause
       // recursive processing.
       if (arch_offset < offset)
         return false;
 
       ByteSlice slice = data_->Slice(arch_offset, arch_size);
       if (!slice.IsValid())
         return false;
 
-      fat_images_.push_back(new MachOImageReader());
+      fat_images_.push_back(base::MakeUnique<MachOImageReader>());
       if (!fat_images_.back()->Initialize(slice.data(), slice.size()))
         return false;
 
       offset += sizeof(*arch);
     }
 
     return true;
   }
 
   bool do_swap = *magic == MH_CIGAM || *magic == MH_CIGAM_64;
@@ skipping 47 matching lines @@
   return true;
 }
 
 bool MachOImageReader::IsFat() {
   return is_fat_;
 }
 
 std::vector<MachOImageReader*> MachOImageReader::GetFatImages() {
   DCHECK(is_fat_);
   std::vector<MachOImageReader*> images;
-  for (auto it = fat_images_.begin(); it != fat_images_.end(); ++it)
-    images.push_back(*it);
+  for (const auto& image : fat_images_)
+    images.push_back(image.get());
   return images;
 }
 
 bool MachOImageReader::Is64Bit() {
   DCHECK(!is_fat_);
   return is_64_bit_;
 }
 
 const mach_header* MachOImageReader::GetMachHeader() {
   DCHECK(!is_fat_);
@@ skipping 32 matching lines @@
   if (lc_code_signature == nullptr)
     return false;
 
   info->resize(lc_code_signature->datasize);
   return data_->CopyDataAt(lc_code_signature->dataoff,
                            lc_code_signature->datasize,
                            &(*info)[0]);
 }
 
 }  // namespace safe_browsing