Fix a problem with the delete-after-reboot code. Removing pending renames of ...

chrome/installer/util/delete_after_reboot_helper.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 defines helper methods used to schedule files for deletion
 // on next reboot. The code here is heavily borrowed and simplified from
 //  http://code.google.com/p/omaha/source/browse/trunk/common/file.cc and
 //  http://code.google.com/p/omaha/source/browse/trunk/common/utils.cc
 //
 // This implementation really is not fast, so do not use it where that will
@@ skipping 226 matching lines @@
   }
   *write_pointer = L'\0';  // Explicitly set the final null char.
   DCHECK(++write_pointer == end_pointer);
 }
 
 std::wstring GetShortPathName(const wchar_t* path) {
   std::wstring short_path;
   DWORD length = GetShortPathName(path, WriteInto(&short_path, MAX_PATH),
                                   MAX_PATH);
   DLOG_IF(WARNING, length == 0) << __FUNCTION__ << " gle=" << GetLastError();
+  if (length == 0) {
+    // GetShortPathName fails if the path is no longer present. Instead of
+    // returning an empty string, just return the original string. This will
+    // serve for our purposes.
+    return path;
+  }
+
   short_path.resize(length);
   return short_path;
 }
 
 HRESULT GetPendingMovesValue(
     std::vector<PendingMove>* pending_moves) {
   DCHECK(pending_moves);
   pending_moves->clear();
 
   // Get the current value of the key
@@ skipping 116 matching lines @@
     return session_manager_key.DeleteValue(kPendingFileRenameOps);
   }
   std::vector<char> buffer;
   StringArrayToMultiSZBytes(strings_to_keep, &buffer);
   DCHECK(buffer.size() > 0);
   if (buffer.empty())
     return false;
   return session_manager_key.WriteValue(kPendingFileRenameOps, &buffer[0],
                                         buffer.size(), REG_MULTI_SZ);
 }