Last small bit of refactoring.

courgette/patch_generator_x86_32.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"
 #include "base/memory/scoped_ptr.h"
 
 #include "courgette/ensemble.h"
 
 namespace courgette {
 
-class CourgetteWin32X86PatchGenerator : public TransformationPatchGenerator {
+class PatchGeneratorX86_32 : public TransformationPatchGenerator {
  public:
-  CourgetteWin32X86PatchGenerator(Element* old_element,
+  PatchGeneratorX86_32(Element* old_element,
                                   Element* new_element,
-                                  CourgetteWin32X86Patcher* patcher)
-      : TransformationPatchGenerator(old_element, new_element, patcher) {
+                                  PatcherX86_32* patcher,
+                                  ExecutableType kind)
+      : TransformationPatchGenerator(old_element, new_element, patcher),
+        kind_(kind) {
   }
 
-  CourgettePatchFile::TransformationMethodId Kind() {
-    return CourgettePatchFile::T_COURGETTE_WIN32_X86;
-  }
+  virtual ExecutableType Kind() { return kind_; }
 
   Status WriteInitialParameters(SinkStream* parameter_stream) {
     if (!parameter_stream->WriteSizeVarint32(
             old_element_->offset_in_ensemble()) ||
         !parameter_stream->WriteSizeVarint32(old_element_->region().length())) {
       return C_STREAM_ERROR;
     }
     return C_OK;
     // TODO(sra): Initialize |patcher_| with these parameters.
   }
@@ skipping 79 matching lines @@
     return C_OK;
   }
 
   Status Reform(SourceStreamSet* transformed_element,
                 SinkStream* reformed_element) {
     return TransformationPatchGenerator::Reform(transformed_element,
                                                 reformed_element);
   }
 
  private:
-  ~CourgetteWin32X86PatchGenerator() { }
+  virtual ~PatchGeneratorX86_32() { }
 
-  DISALLOW_COPY_AND_ASSIGN(CourgetteWin32X86PatchGenerator);
+  ExecutableType kind_;
+
+  DISALLOW_COPY_AND_ASSIGN(PatchGeneratorX86_32);
 };
 
 }  // namespace courgette
 #endif  // COURGETTE_WIN32_X86_GENERATOR_H_