[Courgette] Simple AssemblyProgram and Disassembler cleanups.

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>
 
 #include <algorithm>
 #include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
+#include "base/memory/ptr_util.h"
 #include "courgette/assembly_program.h"
 #include "courgette/base_test_unittest.h"
 #include "courgette/image_utils.h"
 
 namespace courgette {
 
 namespace {
 
 class TestDisassemblerElf32X86 : public DisassemblerElf32X86 {
  public:
@@ skipping 35 matching lines @@
   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 {
   std::string file1 = FileContents(file_name);
 
-  std::unique_ptr<TestDisassemblerElf32X86> disassembler(
-      new TestDisassemblerElf32X86(
-          reinterpret_cast<const uint8_t*>(file1.c_str()), file1.length()));
+  auto disassembler = base::MakeUnique<TestDisassemblerElf32X86>(
+      reinterpret_cast<const uint8_t*>(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
   // real file, since trailing debug info is not included
   EXPECT_EQ(file1.length(), disassembler->length());
 
   const uint8_t* offset_p = disassembler->FileOffsetToPointer(0);
   EXPECT_EQ(reinterpret_cast<const void*>(file1.c_str()),
             reinterpret_cast<const void*>(offset_p));
   EXPECT_EQ(0x7F, offset_p[0]);
   EXPECT_EQ('E', offset_p[1]);
   EXPECT_EQ('L', offset_p[2]);
   EXPECT_EQ('F', offset_p[3]);
 
-  std::unique_ptr<AssemblyProgram> program(new AssemblyProgram(EXE_ELF_32_X86));
+  auto program = base::MakeUnique<AssemblyProgram>(EXE_ELF_32_X86, 0);
 
   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 (auto& typed_rel32 : disassembler->Rel32Locations())
     rel32_list.push_back(typed_rel32->rva());
@@ skipping 26 matching lines @@
 }
 
 }  // namespace
 
 TEST_F(DisassemblerElf32X86Test, All) {
   TestExe("elf-32-1", 200, 3337);
   TestExe("elf-32-high-bss", 0, 4);
 }
 
 }  // namespace courgette