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

base/file_util_win.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 "base/file_util.h"
 
 #include <windows.h>
 #include <propvarutil.h>
 #include <psapi.h>
 #include <shellapi.h>
 #include <shlobj.h>
 #include <time.h>
 #include <string>
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
-#include "base/pe_image.h"
+#include "base/win/pe_image.h"
 #include "base/win/scoped_handle.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/win_util.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/windows_version.h"
 
 namespace file_util {
@@ skipping 1015 matching lines @@
     // what we want so instead we pull the pages into memory by loading
     // the DLL and touching pages at a stride.
     HMODULE dll_module = ::LoadLibraryExW(
         file_path,
         NULL,
         LOAD_WITH_ALTERED_SEARCH_PATH | DONT_RESOLVE_DLL_REFERENCES);
 
     if (!dll_module)
       return false;
 
-    PEImage pe_image(dll_module);
+    base::win::PEImage pe_image(dll_module);
     PIMAGE_NT_HEADERS nt_headers = pe_image.GetNTHeaders();
     size_t actual_size_to_read = size_to_read ? size_to_read :
                                  nt_headers->OptionalHeader.SizeOfImage;
     volatile uint8* touch = reinterpret_cast<uint8*>(dll_module);
     size_t offset = 0;
     while (offset < actual_size_to_read) {
       uint8 unused = *(touch + offset);
       offset += step_size;
     }
     FreeLibrary(dll_module);
   }
 
   return true;
 }
 
 }  // namespace file_util