Unified usage of vector<unique_ptr<T>>

courgette/disassembler_elf_32_x86_unittest.cc

 // Copyright (c) 2011 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 "courgette/disassembler_elf_32_x86.h"
 
 #include <ctype.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 49 matching lines @@
 class DisassemblerElf32X86Test : public BaseTest {
  public:
   void TestExe(const char* file_name,
                size_t expected_abs_count,
                size_t expected_rel_count) const;
 };
 
 void DisassemblerElf32X86Test::TestExe(const char* file_name,
                                        size_t expected_abs_count,
                                        size_t expected_rel_count) const {
-  using TypedRVA = DisassemblerElf32::TypedRVA;
   std::string file1 = FileContents(file_name);
 
   std::unique_ptr<TestDisassemblerElf32X86> disassembler(
       new TestDisassemblerElf32X86(file1.c_str(), file1.length()));
 
   bool can_parse_header = disassembler->ParseHeader();
   EXPECT_TRUE(can_parse_header);
   EXPECT_TRUE(disassembler->ok());
 
   // The length of the disassembled value will be slightly smaller than the
@@ skipping 10 matching lines @@
 
   std::unique_ptr<AssemblyProgram> program(new AssemblyProgram(EXE_ELF_32_X86));
 
   EXPECT_TRUE(disassembler->Disassemble(program.get()));
 
   const std::vector<RVA>& abs32_list = disassembler->Abs32Locations();
 
   // Flatten the list typed rel32 to a list of rel32 RVAs.
   std::vector<RVA> rel32_list;
   rel32_list.reserve(disassembler->Rel32Locations().size());
-  for (TypedRVA* typed_rel32 : disassembler->Rel32Locations())
+  for (auto& typed_rel32 : disassembler->Rel32Locations())
     rel32_list.push_back(typed_rel32->rva());
 
   EXPECT_EQ(expected_abs_count, abs32_list.size());
   EXPECT_EQ(expected_rel_count, rel32_list.size());
 
   EXPECT_TRUE(std::is_sorted(abs32_list.begin(), abs32_list.end()));
   EXPECT_TRUE(std::is_sorted(rel32_list.begin(), rel32_list.end()));
 
   // Verify that rel32 RVAs do not overlap with abs32 RVAs.
   // TODO(huangs): Fix this to account for RVA's 4-byte width.
@@ skipping 17 matching lines @@
 }
 
 }  // namespace
 
 TEST_F(DisassemblerElf32X86Test, All) {
   TestExe("elf-32-1", 200, 3337);
   TestExe("elf-32-high-bss", 0, 4);
 }
 
 }  // namespace courgette