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

chrome/installer/setup/install_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/setup/install.h"
 
 #include <objbase.h>
 #include <stddef.h>
 
 #include <memory>
 #include <string>
 
 #include "base/base_paths.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
-#include "base/path_service.h"
 #include "base/strings/string16.h"
-#include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/scoped_path_override.h"
 #include "base/test/test_shortcut_win.h"
 #include "base/version.h"
 #include "base/win/shortcut.h"
 #include "chrome/installer/setup/install_worker.h"
 #include "chrome/installer/setup/setup_constants.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/installer_state.h"
 #include "chrome/installer/util/master_preferences.h"
 #include "chrome/installer/util/master_preferences_constants.h"
 #include "chrome/installer/util/product.h"
 #include "chrome/installer/util/shell_util.h"
 #include "chrome/installer/util/util_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
-base::FilePath GetNormalizedFilePath(const base::FilePath& path) {
-  base::FilePath normalized_path;
-  EXPECT_TRUE(base::NormalizeFilePath(path, &normalized_path));
-  return normalized_path;
-}
-
 class CreateVisualElementsManifestTest : public testing::Test {
  protected:
   void SetUp() override {
     // Create a temp directory for testing.
     ASSERT_TRUE(test_dir_.CreateUniqueTempDir());
 
     version_ = base::Version("0.0.0.0");
 
     version_dir_ = test_dir_.GetPath().AppendASCII(version_.GetString());
     ASSERT_TRUE(base::CreateDirectory(version_dir_));
@@ skipping 15 matching lines @@
 
   // The path to |test_dir_|\|version_|.
   base::FilePath version_dir_;
 
   // The path to VisualElementsManifest.xml.
   base::FilePath manifest_path_;
 };
 
 class InstallShortcutTest : public testing::Test {
  protected:
-  struct UpdateShortcutsTestCase {
-    // Shortcut target path, relative to |temp_dir_|.
-    const base::FilePath::CharType* target_path;
-
-    // Shortcut icon path, relative to |temp_dir_|. Can be null to create a
-    // shortcut without an icon.
-    const base::FilePath::CharType* icon_path;
-
-    // Whether the shortcut's target path should be updated by
-    // UpdatePerUserShortcutsInLocation().
-    bool should_update;
-  };
-
   void SetUp() override {
     EXPECT_EQ(S_OK, CoInitialize(NULL));
 
     dist_ = BrowserDistribution::GetDistribution();
     ASSERT_TRUE(dist_ != NULL);
     product_.reset(new installer::Product(dist_));
 
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     chrome_exe_ = temp_dir_.GetPath().Append(installer::kChromeExe);
     EXPECT_EQ(0, base::WriteFile(chrome_exe_, "", 0));
@@ skipping 79 matching lines @@
       master_prefs += (i == 0 ? "\"" : ",\"");
       master_prefs += desired_prefs[i].pref_name;
       master_prefs += "\":";
       master_prefs += desired_prefs[i].is_desired ? "true" : "false";
     }
     master_prefs += "}}";
 
     return new installer::MasterPreferences(master_prefs);
   }
 
-  // Creates the shortcuts defined by |test_cases|. Tries to update the target
-  // path of these shortcuts to |new_target_path_relative| using
-  // UpdatePerUserShortcutsInLocation(). Verifies that the right shortcuts have
-  // been updated.
-  void TestUpdateShortcuts(const UpdateShortcutsTestCase* test_cases,
-                           size_t num_test_cases,
-                           const base::FilePath& new_target_path_relative) {
-    // Create shortcuts.
-    for (size_t i = 0; i < num_test_cases; ++i) {
-      // Make sure that the target exists.
-      const base::FilePath target_path =
-          temp_dir_.GetPath().Append(test_cases[i].target_path);
-      if (!base::PathExists(target_path)) {
-        ASSERT_TRUE(base::CreateDirectory(target_path.DirName()));
-        base::File file(target_path, base::File::FLAG_CREATE_ALWAYS |
-                                         base::File::FLAG_WRITE);
-        ASSERT_TRUE(file.IsValid());
-        static const char kDummyData[] = "dummy";
-        ASSERT_EQ(arraysize(kDummyData),
-                  static_cast<size_t>(file.WriteAtCurrentPos(
-                      kDummyData, arraysize(kDummyData))));
-      }
-
-      // Create the shortcut.
-      base::win::ShortcutProperties properties;
-      properties.set_target(target_path);
-      properties.set_icon(temp_dir_.GetPath().Append(test_cases[i].icon_path),
-                          1);
-      ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
-          user_desktop_shortcut_.InsertBeforeExtension(
-              base::SizeTToString16(i)),
-          properties, base::win::SHORTCUT_CREATE_ALWAYS));
-    }
-
-    // Update shortcuts.
-    const base::FilePath new_target_path =
-        temp_dir_.GetPath().Append(new_target_path_relative);
-    installer::UpdatePerUserShortcutsInLocation(
-        ShellUtil::SHORTCUT_LOCATION_DESKTOP, dist_,
-        new_target_path.DirName().DirName(), new_target_path.BaseName(),
-        new_target_path);
-
-    // Verify that shortcuts were updated correctly.
-    for (size_t i = 0; i < num_test_cases; ++i) {
-      base::FilePath target_path;
-      ASSERT_TRUE(base::win::ResolveShortcut(
-          user_desktop_shortcut_.InsertBeforeExtension(
-              base::SizeTToString16(i)),
-          &target_path, nullptr));
-
-      if (test_cases[i].should_update) {
-        EXPECT_EQ(GetNormalizedFilePath(new_target_path),
-                  GetNormalizedFilePath(target_path));
-      } else {
-        EXPECT_EQ(GetNormalizedFilePath(
-                      temp_dir_.GetPath().Append(test_cases[i].target_path)),
-                  GetNormalizedFilePath(target_path));
-      }
-    }
-  }
-
   base::win::ShortcutProperties expected_properties_;
   base::win::ShortcutProperties expected_start_menu_properties_;
 
   BrowserDistribution* dist_;
   base::FilePath chrome_exe_;
   std::unique_ptr<installer::Product> product_;
   std::unique_ptr<installer::MasterPreferences> prefs_;
 
   base::ScopedTempDir temp_dir_;
   base::ScopedTempDir fake_user_desktop_;
@@ skipping 270 matching lines @@
   installer::CreateOrUpdateShortcuts(
       chrome_exe_, *product_, *prefs_, installer::CURRENT_USER,
       installer::INSTALL_SHORTCUT_CREATE_EACH_IF_NO_SYSTEM_LEVEL);
   ASSERT_FALSE(base::PathExists(user_desktop_shortcut_));
   base::win::ValidateShortcut(user_quick_launch_shortcut_,
                               expected_properties_);
   base::win::ValidateShortcut(user_start_menu_shortcut_,
                               expected_start_menu_properties_);
 }
 
-TEST_F(InstallShortcutTest, UpdatePerUserChromeUserLevelShortcuts) {
-  static const UpdateShortcutsTestCase kTestCases[] = {
-      // Shortcut target in the Chrome Canary install directory. No icon.
-      {FILE_PATH_LITERAL("Users\\x\\AppData\\Local\\Google\\Chrome "
-                         "SxS\\Temp\\scoped_dir\\new_chrome.exe"),
-       nullptr, false},
-      {FILE_PATH_LITERAL("Users\\x\\AppData\\Local\\Google\\Chrome "
-                         "SxS\\Temp\\scoped_dir\\chrome.exe"),
-       nullptr, false},
-      {FILE_PATH_LITERAL("Users\\x\\AppData\\Local\\Google\\Chrome "
-                         "SxS\\Application\\chrome.exe"),
-       nullptr, false},
-      {FILE_PATH_LITERAL("Users\\x\\AppData\\Local\\Google\\Chrome "
-                         "SxS\\Application\\something_else.exe"),
-       nullptr, false},
-
-      // Shortcut target in the user-level Chrome install directory. No icon.
-      {FILE_PATH_LITERAL("Users\\x\\AppData\\Local\\Google\\Chrome\\Temp\\scope"
-                         "d_dir\\new_chrome.exe"),
-       nullptr, true},
-      {FILE_PATH_LITERAL("Users\\x\\AppData\\Local\\Google\\Chrome\\Temp\\scope"
-                         "d_dir\\chrome.exe"),
-       nullptr, true},
-      {FILE_PATH_LITERAL(
-           "Users\\x\\AppData\\Local\\Google\\Chrome\\Application\\chrome.exe"),
-       nullptr, true},
-      {FILE_PATH_LITERAL("Users\\x\\AppData\\Local\\Google\\Chrome\\Application"
-                         "\\something_else.exe"),
-       nullptr, false},
-
-      // Shortcut target in the system-level Chrome install directory. No icon.
-      {FILE_PATH_LITERAL("Program Files "
-                         "(x86)\\Google\\Chrome\\Temp\\scoped_dir\\new_chrome."
-                         "exe"),
-       nullptr, false},
-      {FILE_PATH_LITERAL(
-           "Program Files (x86)\\Google\\Chrome\\Temp\\scoped_dir\\chrome.exe"),
-       nullptr, false},
-      {FILE_PATH_LITERAL(
-           "Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe"),
-       nullptr, false},
-      {FILE_PATH_LITERAL("Program Files "
-                         "(x86)\\Google\\Chrome\\Application\\something_else."
-                         "exe"),
-       nullptr, false},
-
-      // Dummy shortcut target. Icon in the Chrome Canary install directory.
-      {FILE_PATH_LITERAL("dummy.exe"),
-       FILE_PATH_LITERAL("Users\\x\\AppData\\Local\\Google\\Chrome "
-                         "SxS\\Application\\chrome.exe"),
-       false},
-      {FILE_PATH_LITERAL("dummy.exe"),
-       FILE_PATH_LITERAL("Users\\x\\AppData\\Local\\Google\\Chrome "
-                         "SxS\\Application\\User Data\\Profile 1\\Google "
-                         "Profile.ico"),
-       false},
-
-      // Dummy shortcut target. Icon in the user-level Chrome install directory.
-      {FILE_PATH_LITERAL("dummy.exe"),
-       FILE_PATH_LITERAL(
-           "Users\\x\\AppData\\Local\\Google\\Chrome\\Application\\chrome.exe"),
-       true},
-      {FILE_PATH_LITERAL("dummy.exe"),
-       FILE_PATH_LITERAL(
-           "Users\\x\\AppData\\Local\\Google\\Chrome\\Application\\User "
-           "Data\\Profile 1\\Google Profile.ico"),
-       true},
-
-      // Dummy shortcut target. Icon in the system-level Chrome install
-      // directory.
-      {FILE_PATH_LITERAL("dummy.exe"),
-       FILE_PATH_LITERAL(
-           "Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe"),
-       false},
-
-      // Shortcuts that don't belong to Chrome.
-      {FILE_PATH_LITERAL("something_else.exe"), nullptr, false},
-      {FILE_PATH_LITERAL("something_else.exe"),
-       FILE_PATH_LITERAL(
-           "Users\\x\\AppData\\Local\\Google\\Something Else.ico"),
-       false},
-  };
-
-  TestUpdateShortcuts(
-      kTestCases, arraysize(kTestCases),
-      base::FilePath(FILE_PATH_LITERAL("Users\\x\\AppData\\Local\\Google\\Chrom"
-                                       "e\\Application\\chrome.exe")));
-}
-
-TEST_F(InstallShortcutTest, UpdatePerUserCanaryShortcuts) {
-  static const UpdateShortcutsTestCase kTestCases[] = {
-      // Shortcut target in the Chrome Canary install directory. No icon.
-      {FILE_PATH_LITERAL("Users\\x\\AppData\\Local\\Google\\Chrome "
-                         "SxS\\Temp\\scoped_dir\\new_chrome.exe"),
-       nullptr, true},
-      {FILE_PATH_LITERAL("Users\\x\\AppData\\Local\\Google\\Chrome "
-                         "SxS\\Temp\\scoped_dir\\chrome.exe"),
-       nullptr, true},
-      {FILE_PATH_LITERAL("Users\\x\\AppData\\Local\\Google\\Chrome "
-                         "SxS\\Application\\chrome.exe"),
-       nullptr, true},
-      {FILE_PATH_LITERAL("Users\\x\\AppData\\Local\\Google\\Chrome "
-                         "SxS\\Application\\something_else.exe"),
-       nullptr, false},
-
-      // Shortcut target in the user-level Chrome install directory. No icon.
-      {FILE_PATH_LITERAL("Users\\x\\AppData\\Local\\Google\\Chrome\\Temp\\scope"
-                         "d_dir\\new_chrome.exe"),
-       nullptr, false},
-      {FILE_PATH_LITERAL("Users\\x\\AppData\\Local\\Google\\Chrome\\Temp\\scope"
-                         "d_dir\\chrome.exe"),
-       nullptr, false},
-      {FILE_PATH_LITERAL(
-           "Users\\x\\AppData\\Local\\Google\\Chrome\\Application\\chrome.exe"),
-       nullptr, false},
-      {FILE_PATH_LITERAL("Users\\x\\AppData\\Local\\Google\\Chrome\\Application"
-                         "\\something_else.exe"),
-       nullptr, false},
-
-      // Shortcut target in the system-level Chrome install directory. No icon.
-      {FILE_PATH_LITERAL("Program Files "
-                         "(x86)\\Google\\Chrome\\Temp\\scoped_dir\\new_chrome."
-                         "exe"),
-       nullptr, false},
-      {FILE_PATH_LITERAL(
-           "Program Files (x86)\\Google\\Chrome\\Temp\\scoped_dir\\chrome.exe"),
-       nullptr, false},
-      {FILE_PATH_LITERAL(
-           "Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe"),
-       nullptr, false},
-      {FILE_PATH_LITERAL("Program Files "
-                         "(x86)\\Google\\Chrome\\Application\\something_else."
-                         "exe"),
-       nullptr, false},
-
-      // Dummy shortcut target. Icon in the Chrome Canary install directory.
-      {FILE_PATH_LITERAL("dummy.exe"),
-       FILE_PATH_LITERAL("Users\\x\\AppData\\Local\\Google\\Chrome "
-                         "SxS\\Application\\chrome.exe"),
-       true},
-      {FILE_PATH_LITERAL("dummy.exe"),
-       FILE_PATH_LITERAL("Users\\x\\AppData\\Local\\Google\\Chrome "
-                         "SxS\\Application\\User Data\\Profile 1\\Google "
-                         "Profile.ico"),
-       true},
-
-      // Dummy shortcut target. Icon in the user-level Chrome install directory.
-      {FILE_PATH_LITERAL("dummy.exe"),
-       FILE_PATH_LITERAL(
-           "Users\\x\\AppData\\Local\\Google\\Chrome\\Application\\chrome.exe"),
-       false},
-      {FILE_PATH_LITERAL("dummy.exe"),
-       FILE_PATH_LITERAL(
-           "Users\\x\\AppData\\Local\\Google\\Chrome\\Application\\User "
-           "Data\\Profile 1\\Google Profile.ico"),
-       false},
-
-      // Dummy shortcut target. Icon in the system-level Chrome install
-      // directory.
-      {FILE_PATH_LITERAL("dummy.exe"),
-       FILE_PATH_LITERAL(
-           "Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe"),
-       false},
-
-      // Shortcuts that don't belong to Chrome.
-      {FILE_PATH_LITERAL("something_else.exe"), nullptr, false},
-      {FILE_PATH_LITERAL("something_else.exe"),
-       FILE_PATH_LITERAL(
-           "Users\\x\\AppData\\Local\\Google\\Something Else.ico"),
-       false},
-  };
-
-  TestUpdateShortcuts(
-      kTestCases, arraysize(kTestCases),
-      base::FilePath(FILE_PATH_LITERAL("Users\\x\\AppData\\Local\\Google\\Chrom"
-                                       "e SxS\\Application\\chrome.exe")));
-}
-
-TEST_F(InstallShortcutTest, UpdatePerUserChromeSystemLevelShortcuts) {
-  static const UpdateShortcutsTestCase kTestCases[] = {
-      // Shortcut target in the Chrome Canary install directory. No icon.
-      {FILE_PATH_LITERAL("Users\\x\\AppData\\Local\\Google\\Chrome "
-                         "SxS\\Temp\\scoped_dir\\new_chrome.exe"),
-       nullptr, false},
-      {FILE_PATH_LITERAL("Users\\x\\AppData\\Local\\Google\\Chrome "
-                         "SxS\\Temp\\scoped_dir\\chrome.exe"),
-       nullptr, false},
-      {FILE_PATH_LITERAL("Users\\x\\AppData\\Local\\Google\\Chrome "
-                         "SxS\\Application\\chrome.exe"),
-       nullptr, false},
-      {FILE_PATH_LITERAL("Users\\x\\AppData\\Local\\Google\\Chrome "
-                         "SxS\\Application\\something_else.exe"),
-       nullptr, false},
-
-      // Shortcut target in the user-level Chrome install directory. No icon.
-      {FILE_PATH_LITERAL("Users\\x\\AppData\\Local\\Google\\Chrome\\Temp\\scope"
-                         "d_dir\\new_chrome.exe"),
-       nullptr, false},
-      {FILE_PATH_LITERAL("Users\\x\\AppData\\Local\\Google\\Chrome\\Temp\\scope"
-                         "d_dir\\chrome.exe"),
-       nullptr, false},
-      {FILE_PATH_LITERAL(
-           "Users\\x\\AppData\\Local\\Google\\Chrome\\Application\\chrome.exe"),
-       nullptr, false},
-      {FILE_PATH_LITERAL("Users\\x\\AppData\\Local\\Google\\Chrome\\Application"
-                         "\\something_else.exe"),
-       nullptr, false},
-
-      // Shortcut target in the system-level Chrome install directory. No icon.
-      {FILE_PATH_LITERAL("Program Files "
-                         "(x86)\\Google\\Chrome\\Temp\\scoped_dir\\new_chrome."
-                         "exe"),
-       nullptr, true},
-      {FILE_PATH_LITERAL(
-           "Program Files (x86)\\Google\\Chrome\\Temp\\scoped_dir\\chrome.exe"),
-       nullptr, true},
-      {FILE_PATH_LITERAL(
-           "Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe"),
-       nullptr, true},
-      {FILE_PATH_LITERAL("Program Files "
-                         "(x86)\\Google\\Chrome\\Application\\something_else."
-                         "exe"),
-       nullptr, false},
-
-      // Dummy shortcut target. Icon in the Chrome Canary install directory.
-      {FILE_PATH_LITERAL("dummy.exe"),
-       FILE_PATH_LITERAL("Users\\x\\AppData\\Local\\Google\\Chrome "
-                         "SxS\\Application\\chrome.exe"),
-       false},
-      {FILE_PATH_LITERAL("dummy.exe"),
-       FILE_PATH_LITERAL("Users\\x\\AppData\\Local\\Google\\Chrome "
-                         "SxS\\Application\\User Data\\Profile 1\\Google "
-                         "Profile.ico"),
-       false},
-
-      // Dummy shortcut target. Icon in the user-level Chrome install directory.
-      {FILE_PATH_LITERAL("dummy.exe"),
-       FILE_PATH_LITERAL(
-           "Users\\x\\AppData\\Local\\Google\\Chrome\\Application\\chrome.exe"),
-       false},
-      {FILE_PATH_LITERAL("dummy.exe"),
-       FILE_PATH_LITERAL(
-           "Users\\x\\AppData\\Local\\Google\\Chrome\\Application\\User "
-           "Data\\Profile 1\\Google Profile.ico"),
-       false},
-
-      // Dummy shortcut target. Icon in the system-level Chrome install
-      // directory.
-      {FILE_PATH_LITERAL("dummy.exe"),
-       FILE_PATH_LITERAL(
-           "Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe"),
-       true},
-
-      // Shortcuts that don't belong to Chrome.
-      {FILE_PATH_LITERAL("something_else.exe"), nullptr, false},
-      {FILE_PATH_LITERAL("something_else.exe"),
-       FILE_PATH_LITERAL(
-           "Users\\x\\AppData\\Local\\Google\\Something Else.ico"),
-       false},
-  };
-
-  TestUpdateShortcuts(
-      kTestCases, arraysize(kTestCases),
-      base::FilePath(FILE_PATH_LITERAL(
-          "Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe")));
-}
-
 TEST(EscapeXmlAttributeValueTest, EscapeCrazyValue) {
   base::string16 val(L"This has 'crazy' \"chars\" && < and > signs.");
   static const wchar_t kExpectedEscapedVal[] =
       L"This has &apos;crazy&apos; \"chars\" &amp;&amp; &lt; and > signs.";
   installer::EscapeXmlAttributeValueInSingleQuotes(&val);
   ASSERT_STREQ(kExpectedEscapedVal, val.c_str());
 }
 
 TEST(EscapeXmlAttributeValueTest, DontEscapeNormalValue) {
   base::string16 val(L"Google Chrome");
   static const wchar_t kExpectedEscapedVal[] = L"Google Chrome";
   installer::EscapeXmlAttributeValueInSingleQuotes(&val);
   ASSERT_STREQ(kExpectedEscapedVal, val.c_str());
 }