Add infrastructure enabling tests of installer upgrade scenarios....

base/win/pe_image.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.
 
 // This file implements PEImage, a generic class to manipulate PE files.
 // This file was adapted from GreenBorder's Code.
 
 #include "base/win/pe_image.h"
 
 namespace base {
@@ skipping 540 matching lines @@
     return NULL;
 
   return reinterpret_cast<char*>(module_) + rva;
 }
 
 PVOID PEImageAsData::RVAToAddr(DWORD rva) const {
   if (rva == 0)
     return NULL;
 
   PVOID in_memory = PEImage::RVAToAddr(rva);
-  DWORD dummy;
+  DWORD disk_offset;
 
-  if (!ImageAddrToOnDiskOffset(in_memory, &dummy))
+  if (!ImageAddrToOnDiskOffset(in_memory, &disk_offset))
     return NULL;
 
-  return in_memory;
+  return PEImage::RVAToAddr(disk_offset);
 }
 
 }  // namespace win
 }  // namespace base