[Courgette] Simple AssemblyProgram and Disassembler cleanups.

courgette/adjustment_method_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 <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
-#include "base/strings/string_util.h"
+#include "base/memory/ptr_util.h"
 #include "courgette/assembly_program.h"
 #include "courgette/courgette.h"
 #include "courgette/encoded_program.h"
 #include "courgette/image_utils.h"
 #include "courgette/streams.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace courgette {
 
 namespace {
 
 class AdjustmentMethodTest : public testing::Test {
  public:
   void Test1() const;
 
  private:
   void SetUp() {
   }
 
   void TearDown() {
   }
 
   // Returns one of two similar simple programs. These differ only in Label
   // assignment, so it is possible to make them look identical.
   std::unique_ptr<AssemblyProgram> MakeProgram(int kind) const {
-    std::unique_ptr<AssemblyProgram> prog(new AssemblyProgram(EXE_WIN_32_X86));
-    prog->set_image_base(0x00400000);
+    auto prog = base::MakeUnique<AssemblyProgram>(EXE_WIN_32_X86, 0x00400000);
 
     RVA kRvaA = 0x00410000;
     RVA kRvaB = 0x00410004;
 
     std::vector<RVA> abs32_rvas;
     abs32_rvas.push_back(kRvaA);
     abs32_rvas.push_back(kRvaB);
     std::vector<RVA> rel32_rvas;  // Stub.
 
     TrivialRvaVisitor abs32_visitor(abs32_rvas);
@@ skipping 82 matching lines @@
   EXPECT_TRUE(s5 == s6);  // Adjustment did change B into A
 }
 
 TEST_F(AdjustmentMethodTest, All) {
   Test1();
 }
 
 }  // namespace
 
 }  // namespace courgette