Revert of [Courgette] Clean up Disassembler; fix ELF Memory leaks.

courgette/disassembler_win32_x64_unittest.cc

 // Copyright 2013 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/disassembler_win32_x64.h"
 
 #include <stdint.h>
 
-#include <string>
-#include <vector>
-
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "courgette/base_test_unittest.h"
 
 class DisassemblerWin32X64Test : public BaseTest {
  public:
   void TestExe() const;
   void TestExe32() const;
   void TestResourceDll() const;
 };
@@ skipping 11 matching lines @@
   EXPECT_EQ(file1.length(), disassembler->length());
 
   EXPECT_TRUE(disassembler->ok());
   EXPECT_TRUE(disassembler->has_text_section());
   EXPECT_EQ(488448U, disassembler->size_of_code());
   EXPECT_FALSE(disassembler->is_32bit());
   EXPECT_EQ(courgette::DisassemblerWin32X64::SectionName(
       disassembler->RVAToSection(0x00401234 - 0x00400000)),
       std::string(".text"));
 
-  EXPECT_EQ(0U, disassembler->RVAToFileOffset(0));
-  EXPECT_EQ(1024U, disassembler->RVAToFileOffset(4096));
-  EXPECT_EQ(46928U, disassembler->RVAToFileOffset(50000));
+  EXPECT_EQ(0, disassembler->RVAToFileOffset(0));
+  EXPECT_EQ(1024, disassembler->RVAToFileOffset(4096));
+  EXPECT_EQ(46928, disassembler->RVAToFileOffset(50000));
 
   std::vector<courgette::RVA> relocs;
   bool can_parse_relocs = disassembler->ParseRelocs(&relocs);
   EXPECT_TRUE(can_parse_relocs);
   EXPECT_TRUE(base::STLIsSorted(relocs));
 
-  const uint8_t* offset_p = disassembler->FileOffsetToPointer(0);
+  const uint8_t* offset_p = disassembler->OffsetToPointer(0);
   EXPECT_EQ(reinterpret_cast<const void*>(file1.c_str()),
             reinterpret_cast<const void*>(offset_p));
   EXPECT_EQ('M', offset_p[0]);
   EXPECT_EQ('Z', offset_p[1]);
 
   const uint8_t* rva_p = disassembler->RVAToPointer(0);
   EXPECT_EQ(reinterpret_cast<const void*>(file1.c_str()),
             reinterpret_cast<const void*>(rva_p));
   EXPECT_EQ('M', rva_p[0]);
   EXPECT_EQ('Z', rva_p[1]);
@@ skipping 33 matching lines @@
   EXPECT_FALSE(disassembler->has_text_section());
   EXPECT_EQ(0U, disassembler->size_of_code());
   EXPECT_FALSE(disassembler->is_32bit());
 }
 
 TEST_F(DisassemblerWin32X64Test, All) {
   TestExe();
   TestExe32();
   TestResourceDll();
 }