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

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"
@@ skipping 34 matching lines @@
     abs32_rvas.push_back(kRvaB);
     std::vector<RVA> rel32_rvas;  // Stub.
 
     TrivialRvaVisitor abs32_visitor(abs32_rvas);
     TrivialRvaVisitor rel32_visitor(rel32_rvas);
     prog->PrecomputeLabels(&abs32_visitor, &rel32_visitor);
 
     Label* labelA = prog->FindAbs32Label(kRvaA);
     Label* labelB = prog->FindAbs32Label(kRvaB);
 
-    AssemblyProgram::InstructionGenerator gen = base::Bind(
-        [](Label* labelA, Label* labelB, AssemblyProgram* prog,
+    InstructionGenerator gen = base::Bind(
+        [](Label* labelA, Label* labelB,
            InstructionReceptor* receptor) -> CheckBool {
           EXPECT_TRUE(receptor->EmitAbs32(labelA));
           EXPECT_TRUE(receptor->EmitAbs32(labelA));
           EXPECT_TRUE(receptor->EmitAbs32(labelB));
           EXPECT_TRUE(receptor->EmitAbs32(labelA));
           EXPECT_TRUE(receptor->EmitAbs32(labelA));
           EXPECT_TRUE(receptor->EmitAbs32(labelB));
           return true;
         },
         labelA, labelB);
@@ skipping 64 matching lines @@
   EXPECT_TRUE(s5 == s6);  // Adjustment did change B into A
 }
 
 TEST_F(AdjustmentMethodTest, All) {
   Test1();
 }
 
 }  // namespace
 
 }  // namespace courgette