Move pe_image and registry from base to base/win and use the namespace. It re...

app/win/iat_patch_function.cc

 // Copyright (c) 2010 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 "app/win/iat_patch_function.h"
 
 #include "base/logging.h"
+#include "base/win/pe_image.h"
 
 namespace app {
 namespace win {
 
 namespace {
 
 struct InterceptFunctionInformation {
   bool finished_operation;
   const char* imported_from_module;
   const char* function_name;
@@ skipping 54 matching lines @@
                   old_page_protection,
                   &old_page_protection);
   } else {
     error = GetLastError();
     NOTREACHED();
   }
 
   return error;
 }
 
-bool InterceptEnumCallback(const PEImage &image, const char* module,
+bool InterceptEnumCallback(const base::win::PEImage& image, const char* module,
                            DWORD ordinal, const char* name, DWORD hint,
                            IMAGE_THUNK_DATA* iat, void* cookie) {
   InterceptFunctionInformation* intercept_information =
     reinterpret_cast<InterceptFunctionInformation*>(cookie);
 
   if (NULL == intercept_information) {
     NOTREACHED();
     return false;
   }
 
@@ skipping 47 matching lines @@
                                 const char* imported_from_module,
                                 const char* function_name, void* new_function,
                                 void** old_function,
                                 IMAGE_THUNK_DATA** iat_thunk) {
   if ((NULL == module_handle) || (NULL == imported_from_module) ||
      (NULL == function_name) || (NULL == new_function)) {
     NOTREACHED();
     return ERROR_INVALID_PARAMETER;
   }
 
-  PEImage target_image(module_handle);
+  base::win::PEImage target_image(module_handle);
   if (!target_image.VerifyMagic()) {
     NOTREACHED();
     return ERROR_INVALID_PARAMETER;
   }
 
   InterceptFunctionInformation intercept_information = {
     false,
     imported_from_module,
     function_name,
     new_function,
@@ skipping 107 matching lines @@
   module_handle_ = NULL;
   intercept_function_ = NULL;
   original_function_ = NULL;
   iat_thunk_ = NULL;
 
   return error;
 }
 
 }  // namespace win
 }  // namespace app