Start refactoring to reduce executable type knowledge.

courgette/win32_x86_generator.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.
 
 // This is the transformation and adjustment for Windows X86 executables.
 
 #ifndef COURGETTE_WIN32_X86_GENERATOR_H_
 #define COURGETTE_WIN32_X86_GENERATOR_H_
 
 #include "base/logging.h"
@@ skipping 43 matching lines @@
                    SinkStreamSet* old_transformed_element,
                    SinkStreamSet* new_transformed_element) {
     // Don't expect any corrected parameters.
     if (!corrected_parameters->Empty())
       return C_GENERAL_ERROR;
 
     // Generate old version of program using |corrected_parameters|.
     // TODO(sra): refactor to use same code from patcher_.
     AssemblyProgram* old_program = NULL;
     Status old_parse_status =
-        ParseWin32X86PE(old_element_->region().start(),
-                        old_element_->region().length(),
-                        &old_program);
+        ParseDetectedExecutable(old_element_->region().start(),
+                                old_element_->region().length(),
+                                &old_program);
     if (old_parse_status != C_OK) {
       LOG(ERROR) << "Cannot parse as Win32X86PE " << old_element_->Name();
       return old_parse_status;
     }
 
     AssemblyProgram* new_program = NULL;
     Status new_parse_status =
-        ParseWin32X86PE(new_element_->region().start(),
-                        new_element_->region().length(),
-                        &new_program);
+        ParseDetectedExecutable(new_element_->region().start(),
+                                new_element_->region().length(),
+                                &new_program);
     if (new_parse_status != C_OK) {
       DeleteAssemblyProgram(old_program);
       LOG(ERROR) << "Cannot parse as Win32X86PE " << new_element_->Name();
       return new_parse_status;
     }
 
     EncodedProgram* old_encoded = NULL;
     Status old_encode_status = Encode(old_program, &old_encoded);
     if (old_encode_status != C_OK) {
       DeleteAssemblyProgram(old_program);
@@ skipping 37 matching lines @@
   }
 
  private:
   ~CourgetteWin32X86PatchGenerator() { }
 
   DISALLOW_COPY_AND_ASSIGN(CourgetteWin32X86PatchGenerator);
 };
 
 }  // namespace courgette
 #endif  // COURGETTE_WIN32_X86_GENERATOR_H_