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..74699b570e71fcea8f6aaec55193724c8f056a25 100644
--- a/chrome/installer/util/install_util.h
+++ b/chrome/installer/util/install_util.h
@@ -190,18 +190,24 @@ class InstallUtil {
   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);