Remove shortcut path fixups introduced to repair breakages caused by r378802.

chrome/installer/util/install_util.cc

 // Copyright (c) 2012 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.
 //
 // See the corresponding header file for description of the functions in this
 // file.
 
 #include "chrome/installer/util/install_util.h"
 
 #include <shellapi.h>
@@ skipping 512 matching lines @@
     --len;  // Subtract terminating \0.
   } else {
     PLOG(DFATAL) << "GetDateFormat";
   }
 
   return base::string16(date_str, len);
 }
 
 // Open |path| with minimal access to obtain information about it, returning
 // true and populating |file| on success.
+// static
 bool InstallUtil::ProgramCompare::OpenForInfo(const base::FilePath& path,
-                                              base::File* file,
-                                              ComparisonType comparison_type) {
+                                              base::File* file) {
   DCHECK(file);
-  uint32_t flags = base::File::FLAG_OPEN;
-  if (comparison_type == ComparisonType::FILE_OR_DIRECTORY)
-    flags |= base::File::FLAG_BACKUP_SEMANTICS;
-  file->Initialize(path, flags);
+  file->Initialize(path, base::File::FLAG_OPEN);
   return file->IsValid();
 }
 
 // Populate |info| for |file|, returning true on success.
 // static
 bool InstallUtil::ProgramCompare::GetInfo(const base::File& file,
                                           BY_HANDLE_FILE_INFORMATION* info) {
   DCHECK(file.IsValid());
   return GetFileInformationByHandle(file.GetPlatformFile(), info) != 0;
 }
@@ skipping 33 matching lines @@
     list->AddDeleteRegValueWorkItem(root, dist->GetStateKey(), KEY_WOW64_32KEY,
                                     kRegDowngradeVersion);
   } else if (*current_version > new_version && !downgrade_version.IsValid()) {
     list->AddSetRegValueWorkItem(
         root, dist->GetStateKey(), KEY_WOW64_32KEY, kRegDowngradeVersion,
         base::ASCIIToUTF16(current_version->GetString()), true);
   }
 }
 
 InstallUtil::ProgramCompare::ProgramCompare(const base::FilePath& path_to_match)
-    : ProgramCompare(path_to_match, ComparisonType::FILE) {}
-
-InstallUtil::ProgramCompare::ProgramCompare(const base::FilePath& path_to_match,
-                                            ComparisonType comparison_type)
     : path_to_match_(path_to_match),
-      file_info_(),
-      comparison_type_(comparison_type) {
+      file_info_() {
   DCHECK(!path_to_match_.empty());
-  if (!OpenForInfo(path_to_match_, &file_, comparison_type_)) {
+  if (!OpenForInfo(path_to_match_, &file_)) {
     PLOG(WARNING) << "Failed opening " << path_to_match_.value()
                   << "; falling back to path string comparisons.";
   } else if (!GetInfo(file_, &file_info_)) {
     PLOG(WARNING) << "Failed getting information for "
                   << path_to_match_.value()
                   << "; falling back to path string comparisons.";
     file_.Close();
   }
 }
 
@@ skipping 23 matching lines @@
 
   // If the paths don't match and we couldn't open the expected file, we've done
   // our best.
   if (!file_.IsValid())
     return false;
 
   // Open the program and see if it references the expected file.
   base::File file;
   BY_HANDLE_FILE_INFORMATION info = {};
 
-  return (OpenForInfo(path, &file, comparison_type_) && GetInfo(file, &info) &&
+  return (OpenForInfo(path, &file) &&
+          GetInfo(file, &info) &&
           info.dwVolumeSerialNumber == file_info_.dwVolumeSerialNumber &&
           info.nFileIndexHigh == file_info_.nFileIndexHigh &&
           info.nFileIndexLow == file_info_.nFileIndexLow);
 }