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

sandbox/src/sidestep_resolver.cc

 // Copyright (c) 2006-2008 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 "sandbox/src/sidestep_resolver.h"
 
-#include "base/pe_image.h"
+#include "base/win/pe_image.h"
 #include "sandbox/src/sandbox_nt_util.h"
 #include "sandbox/src/sidestep/preamble_patcher.h"
 
 namespace {
 
 const size_t kSizeOfSidestepStub = sidestep::kMaxPreambleStubSize;
 
 struct SidestepThunk {
   char sidestep[kSizeOfSidestepStub];  // Storage for the sidestep stub.
   int internal_thunk;  // Dummy member to the beginning of the internal thunk.
@@ skipping 166 matching lines @@
     pop eax
     ret                                 // Jump to original function.
   }
 }
 
 bool SmartSidestepResolverThunk::IsInternalCall(const void* base,
                                                 void* return_address) {
   DCHECK_NT(base);
   DCHECK_NT(return_address);
 
-  PEImage pe(base);
+  base::win::PEImage pe(base);
   if (pe.GetImageSectionFromAddr(return_address))
     return true;
   return false;
 }
 
 }  // namespace sandbox