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

chrome/installer/util/install_util_unittest.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.
 
 #include "chrome/installer/util/install_util.h"
 
 #include <string>
 #include <utility>
 
 #include "base/base_paths.h"
@@ skipping 435 matching lines @@
                                      MAX_PATH);
   ASSERT_NE(static_cast<DWORD>(0), short_len);
   ASSERT_GT(static_cast<DWORD>(MAX_PATH), short_len);
   short_expect.resize(short_len);
   ASSERT_FALSE(base::FilePath::CompareEqualIgnoreCase(expect.value(),
                                                       short_expect));
   EXPECT_TRUE(InstallUtil::ProgramCompare(expect).Evaluate(
       L"\"" + short_expect + L"\""));
 }
 
+TEST_F(InstallUtilTest, ProgramCompareWithDirectories) {

[gab, 2016/03/21 19:28:13]

Should also verify that all other file tests pass just as well when
ComparisonType is FILE_OR_DIRECTORY.

+  base::ScopedTempDir test_dir;
+  ASSERT_TRUE(test_dir.CreateUniqueTempDir());
+  const base::FilePath some_long_dir(
+      test_dir.path().Append(L"Some Long Directory Name"));
+  const base::FilePath expect(some_long_dir.Append(L"directory"));
+  const base::FilePath expect_upcase(some_long_dir.Append(L"DIRECTORY"));
+  const base::FilePath other(some_long_dir.Append(L"other_directory"));
+
+  ASSERT_TRUE(base::CreateDirectory(some_long_dir));
+  ASSERT_TRUE(base::CreateDirectory(expect));
+  ASSERT_TRUE(base::CreateDirectory(other));
+
+  InstallUtil::ProgramCompare program_compare(
+      expect, InstallUtil::ProgramCompare::ComparisonType::FILE_OR_DIRECTORY);
+
+  // Paths match exactly.
+  EXPECT_TRUE(program_compare.EvaluatePath(expect));
+  // Paths differ by case.
+  EXPECT_TRUE(program_compare.EvaluatePath(expect_upcase));
+  // Paths don't match.
+  EXPECT_FALSE(program_compare.EvaluatePath(other));
+
+  // Test where strings don't match, but the same directory is indicated.
+  std::wstring short_expect;

[gab, 2016/03/21 19:28:13]

base::string16

+  DWORD short_len =
+      GetShortPathName(expect.value().c_str(),
+                       base::WriteInto(&short_expect, MAX_PATH), MAX_PATH);
+  ASSERT_NE(static_cast<DWORD>(0), short_len);
+  ASSERT_GT(static_cast<DWORD>(MAX_PATH), short_len);
+  short_expect.resize(short_len);
+  ASSERT_FALSE(
+      base::FilePath::CompareEqualIgnoreCase(expect.value(), short_expect));
+  EXPECT_TRUE(program_compare.EvaluatePath(expect));
+  EXPECT_TRUE(program_compare.EvaluatePath(expect_upcase));
+  EXPECT_FALSE(program_compare.EvaluatePath(other));
+}
+
 // Win64 Chrome is always installed in the 32-bit Program Files directory. Test
 // that IsPerUserInstall returns false for an arbitrary path with
 // DIR_PROGRAM_FILESX86 as a suffix but not DIR_PROGRAM_FILES when the two are
 // unrelated.
 TEST_F(InstallUtilTest, IsPerUserInstall) {
 #if defined(_WIN64)
   const int kChromeProgramFilesKey = base::DIR_PROGRAM_FILESX86;
 #else
   const int kChromeProgramFilesKey = base::DIR_PROGRAM_FILES;
 #endif
   base::ScopedPathOverride program_files_override(kChromeProgramFilesKey);
   base::FilePath some_exe;
   ASSERT_TRUE(PathService::Get(kChromeProgramFilesKey, &some_exe));
   some_exe = some_exe.AppendASCII("Company")
       .AppendASCII("Product")
       .AppendASCII("product.exe");
   EXPECT_FALSE(InstallUtil::IsPerUserInstall(some_exe));
 
 #if defined(_WIN64)
   const int kOtherProgramFilesKey = base::DIR_PROGRAM_FILES;
   base::ScopedPathOverride other_program_files_override(kOtherProgramFilesKey);
   ASSERT_TRUE(PathService::Get(kOtherProgramFilesKey, &some_exe));
   some_exe = some_exe.AppendASCII("Company")
       .AppendASCII("Product")
       .AppendASCII("product.exe");
   EXPECT_TRUE(InstallUtil::IsPerUserInstall(some_exe));
 #endif  // defined(_WIN64)
 }