Further refactoring, move ImageInfo into Disassembler/DisassemblerWin32X86.

courgette/assembly_program.h

 // 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.
 
 #ifndef COURGETTE_ASSEMBLY_PROGRAM_H_
 #define COURGETTE_ASSEMBLY_PROGRAM_H_
 
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 
-#include "courgette/image_info.h"
+#include "courgette/disassembler.h"
 #include "courgette/memory_allocator.h"
 
 namespace courgette {
 
 class EncodedProgram;
 class Instruction;
 
 typedef NoThrowBuffer<Instruction*> InstructionVector;
 
 // A Label is a symbolic reference to an address.  Unlike a conventional
@@ skipping 105 matching lines @@
   // We have separate label spaces for addresses referenced by rel32 labels and
   // abs32 labels.  This is somewhat arbitrary.
   RVAToLabel rel32_labels_;
   RVAToLabel abs32_labels_;
 
   DISALLOW_COPY_AND_ASSIGN(AssemblyProgram);
 };
 
 }  // namespace courgette
 #endif  // COURGETTE_ASSEMBLY_PROGRAM_H_