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

chrome/installer/util/install_util.h

Index: chrome/installer/util/install_util.h
diff --git a/chrome/installer/util/install_util.h b/chrome/installer/util/install_util.h
index 672f0ff8d854c8076c040e948848155d544be528..79b8e2a2304f8755ce5a038b18da275ec1ddd017 100644
--- a/chrome/installer/util/install_util.h
+++ b/chrome/installer/util/install_util.h
@@ -189,19 +189,35 @@ class InstallUtil {
   // the same file.
   class ProgramCompare : public RegistryValuePredicate {
    public:
+    enum class ComparisonType {
+      // Evaluation compares existing files.
+      FILE,
+      // Evaluation compares existing files or directories.
+      FILE_OR_DIRECTORY,
+    };
+
+    // Constructs a ProgramCompare with FILE as ComparisonType.
     explicit ProgramCompare(const base::FilePath& path_to_match);
+
+    // Constructs a ProgramCompare with |comparison_type| as ComparisonType.
+    ProgramCompare(const base::FilePath& path_to_match,
+                   ComparisonType comparison_type);
+
     ~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,
+                            ComparisonType comparison_type);
     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_;
+    ComparisonType comparison_type_;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(ProgramCompare);