[Courgette] Refactor: Unify Disassembler::Disassemble() and instantiate AssemblyProgram there.

courgette/program_detector.cc

 // Copyright 2016 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/program_detector.h"
 
 #include <utility>
 
-#include "base/memory/ptr_util.h"
 #include "courgette/assembly_program.h"
 #include "courgette/disassembler.h"
 #include "courgette/disassembler_elf_32_arm.h"
 #include "courgette/disassembler_elf_32_x86.h"
 #include "courgette/disassembler_win32_x64.h"
 #include "courgette/disassembler_win32_x86.h"
 
 namespace courgette {
 
 namespace {
@@ skipping 50 matching lines @@
 Status ParseDetectedExecutable(const uint8_t* buffer,
                                size_t length,
                                std::unique_ptr<AssemblyProgram>* output) {
   output->reset();
 
   std::unique_ptr<Disassembler> disassembler(
       DetectDisassembler(buffer, length));
   if (!disassembler)
     return C_INPUT_NOT_RECOGNIZED;
 
-  auto program = base::MakeUnique<AssemblyProgram>(disassembler->kind(),
-                                                   disassembler->image_base());
-
-  if (!disassembler->Disassemble(program.get()))
+  std::unique_ptr<AssemblyProgram> program = disassembler->Disassemble();
+  if (!program.get())
     return C_DISASSEMBLY_FAILED;
 
   *output = std::move(program);
   return C_OK;
 }
 
 }  // namespace courgette