Last small bit of refactoring.

courgette/ensemble_apply.cc

 // 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 file contains the code to apply a Courgette patch.
 
 #include "courgette/ensemble.h"
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 
 #include "courgette/crc.h"
 #include "courgette/region.h"
 #include "courgette/streams.h"
 #include "courgette/simple_delta.h"
-#include "courgette/win32_x86_patcher.h"
+#include "courgette/patcher_x86_32.h"
 
 namespace courgette {
 
 // EnsemblePatchApplication is all the logic and data required to apply the
 // multi-stage patch.
 class EnsemblePatchApplication {
  public:
   EnsemblePatchApplication();
   ~EnsemblePatchApplication();
 
@@ skipping 104 matching lines @@
 
   for (size_t i = 0;  i < number_of_transformations;  ++i) {
     uint32 kind;
     if (!transformation_parameters->ReadVarint32(&kind))
       return C_BAD_ENSEMBLE_HEADER;
 
     TransformationPatcher* patcher = NULL;
 
     switch (kind)
     {
-      case CourgettePatchFile::T_COURGETTE_WIN32_X86:
-        patcher = new CourgetteWin32X86Patcher(base_region_);
+      case EXE_WIN_32_X86:
+        patcher = new PatcherX86_32(base_region_);
         break;
     }
 
     if (patcher)
       patchers_.push_back(patcher);
     else
       return C_BAD_ENSEMBLE_HEADER;
   }
 
   for (size_t i = 0;  i < patchers_.size();  ++i) {
@@ skipping 259 matching lines @@
           static_cast<int>(new_sink_stream.Length()));
   if (written == -1)
     return C_WRITE_OPEN_ERROR;
   if (static_cast<size_t>(written) != new_sink_stream.Length())
     return C_WRITE_ERROR;
 
   return C_OK;
 }
 
 }  // namespace