Last small bit of refactoring.

courgette/disassembler_win32_x86.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_DISASSEMBLER_WIN32_X86_H_
 #define COURGETTE_DISASSEMBLER_WIN32_X86_H_
 
 #include "base/basictypes.h"
 #include "courgette/disassembler.h"
 #include "courgette/memory_allocator.h"
 #include "courgette/types_win_pe.h"
 
 namespace courgette {
 
 class AssemblyProgram;
 
 class DisassemblerWin32X86 : public Disassembler {
  public:
   explicit DisassemblerWin32X86(const void* start, size_t length);
 
-  virtual ExecutableType kind() { return WIN32_X86; }
+  virtual ExecutableType kind() { return EXE_WIN_32_X86; }
 
   // Returns 'true' if the buffer appears to point to a Windows 32 bit
   // executable, 'false' otherwise.  If ParseHeader() succeeds, other member
   // functions may be called.
   virtual bool ParseHeader();
 
   virtual bool Disassemble(AssemblyProgram* target);
 
   //
   // Exposed for test purposes
@@ skipping 115 matching lines @@
   std::map<RVA, int> abs32_target_rvas_;
   std::map<RVA, int> rel32_target_rvas_;
 #endif
 
 
   DISALLOW_COPY_AND_ASSIGN(DisassemblerWin32X86);
 };
 
 }  // namespace courgette
 #endif  // COURGETTE_DISASSEMBLER_WIN32_X86_H_