Fix the path of shortcuts with an icon in the current install dir.

chrome/installer/util/install_util.h

 // 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.
 //
 // This file declares utility functions for the installer. The original reason
 // for putting these functions in installer\util library is so that we can
 // separate out the critical logic and write unit tests for it.
 
 #ifndef CHROME_INSTALLER_UTIL_INSTALL_UTIL_H_
 #define CHROME_INSTALLER_UTIL_INSTALL_UTIL_H_
@@ skipping 172 matching lines @@
   // Returns a string in the form YYYYMMDD of the current date.
   static base::string16 GetCurrentDate();
 
   // A predicate that compares the program portion of a command line with a
   // given file path.  First, the file paths are compared directly.  If they do
   // not match, the filesystem is consulted to determine if the paths reference
   // the same file.
   class ProgramCompare : public RegistryValuePredicate {
    public:
     explicit ProgramCompare(const base::FilePath& path_to_match);
+    ProgramCompare(const base::FilePath& path_to_match,

[gab, 2016/03/21 15:27:04]

Add tests for new form.

[fdoray, 2016/03/21 15:44:29]

Done.

+                   bool support_directories);

[gab, 2016/03/21 15:27:04]

Prefer enum to bool (bool makes callsites obscure).
For example base::StartsWith() and friends used to take a bool to indicate
desire for case-sensitivity and have recently been switched to an enum for
clarity when reading callsite:
https://code.google.com/p/chromium/codesearch#chromium/src/base/strings/strin...


Something like:

enum class ComparisonType {
  // Evaluation compares existing files.
  COMPARE_FILE,
  // Evaluation compares existing files or directories.
  COMPARE_FILE_OR_DIRECTORY,
}

// Constructs a ProgramCompare with COMPARE_FILE as ComparisonType.
explicit ProgramCompare(const base::FilePath& path_to_match);
(...)

[fdoray, 2016/03/21 15:44:29]

Done.

+
     ~ProgramCompare() override;
     bool Evaluate(const base::string16& value) const override;
     bool EvaluatePath(const base::FilePath& path) const;
 
    protected:
-    static bool OpenForInfo(const base::FilePath& path, base::File* file);
+    static bool OpenForInfo(const base::FilePath& path,
+                            base::File* file,
+                            bool support_directories);
     static bool GetInfo(const base::File& file,
                         BY_HANDLE_FILE_INFORMATION* info);
 
     base::FilePath path_to_match_;
     base::File file_;
     BY_HANDLE_FILE_INFORMATION file_info_;
+    bool support_directories_;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(ProgramCompare);
   };  // class ProgramCompare
 
  private:
   DISALLOW_COPY_AND_ASSIGN(InstallUtil);
 };
 
 
 #endif  // CHROME_INSTALLER_UTIL_INSTALL_UTIL_H_