Prevent redirector from returning the current module in cases where it fails to look up the first...

chrome/installer/test/alternate_version_generator.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.
 
 // The file contains the implementation of the mini_installer re-versioner.
 // The main function (GenerateNextVersion) does the following in a temp dir:
 // - Extracts and unpacks setup.exe and the Chrome-bin folder from
 //   mini_installer.exe.
 // - Inspects setup.exe to determine the current version.
 // - Runs through all .dll and .exe files:
@@ skipping 72 matching lines @@
     if (!file_util::CreateNewTempDirectory(&kTempDirPrefix[0], &directory_)) {
       LOG(DFATAL) << "Failed creating temporary directory.";
       return false;
     }
     return true;
   }
   const FilePath& directory() const {
     DCHECK(!directory_.empty());
     return directory_;
   }
+
  private:
   FilePath directory_;
   DISALLOW_COPY_AND_ASSIGN(ScopedTempDirectory);
 };  // class ScopedTempDirectory
 
 // A helper class for manipulating a Chrome product version.
 class ChromeVersion {
  public:
   static ChromeVersion FromHighLow(DWORD high, DWORD low) {
     return ChromeVersion(static_cast<ULONGLONG>(high) << 32 |
@@ skipping 226 matching lines @@
 
 // Updates the version strings and numbers in all of |image_file|'s resources.
 bool UpdateVersionIfMatch(const FilePath& image_file,
                           VisitResourceContext* context) {
   bool result = false;
   base::win::ScopedHandle image_handle(base::CreatePlatformFile(
       image_file,
       (base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ |
        base::PLATFORM_FILE_WRITE | base::PLATFORM_FILE_EXCLUSIVE_READ |
        base::PLATFORM_FILE_EXCLUSIVE_WRITE), NULL, NULL));
-  if (image_handle.Get() != INVALID_HANDLE_VALUE) {

[grt (UTC plus 2), 2011/09/12 17:27:15]

Greg is a booboo head.

+  // It turns out that the underlying CreateFile can fail due to unhelpful
+  // security software locking the newly created DLL. So add a few brief
+  // retries to help tests that use this pass on machines thusly encumbered.
+  int retries = 3;
+  while (!image_handle.IsValid() && retries-- > 0) {
+    LOG(WARNING) << "Failed to open \"" << image_file.value() << "\"."
+                 << " Retrying " << retries << " more times.";
+    Sleep(1000);
+    image_handle.Set(base::CreatePlatformFile(
+      image_file,
+      (base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ |
+       base::PLATFORM_FILE_WRITE | base::PLATFORM_FILE_EXCLUSIVE_READ |
+       base::PLATFORM_FILE_EXCLUSIVE_WRITE), NULL, NULL));
+  }
+
+  if (image_handle.IsValid()) {
     MappedFile image_mapping;
     if (image_mapping.Initialize(image_handle)) {
       base::win::PEImageAsData image(
           reinterpret_cast<HMODULE>(image_mapping.data()));
       // PEImage class does not support other-architecture images.
       if (image.GetNTHeaders()->OptionalHeader.Magic ==
           IMAGE_NT_OPTIONAL_HDR_MAGIC) {
         result = upgrade_test::EnumResources(
             image, &VisitResource, reinterpret_cast<uintptr_t>(context));
       } else {
@@ skipping 286 matching lines @@
       !UpdateVersionIfMatch(target_file, &ctx)) {
     LOG(DFATAL) << "Failed to update version in \"" << target_file.value()
                 << "\"";
     return false;
   }
 
   return true;
 }
 
 }  // namespace upgrade_test