Fix shortcut tests and remove legacy shortcut code.

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 <objbase.h>
 
 #include <string>
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ skipping 76 matching lines @@
     expected_properties_.set_description(chrome_properties.description);
     expected_properties_.set_dual_mode(false);
     expected_start_menu_properties_ = expected_properties_;
     expected_start_menu_properties_.set_dual_mode(true);
 
     prefs_.reset(GetFakeMasterPrefs(false, false, false));
 
     ASSERT_TRUE(fake_user_desktop_.CreateUniqueTempDir());
     ASSERT_TRUE(fake_common_desktop_.CreateUniqueTempDir());
     ASSERT_TRUE(fake_user_quick_launch_.CreateUniqueTempDir());
-    ASSERT_TRUE(fake_default_user_quick_launch_.CreateUniqueTempDir());
     ASSERT_TRUE(fake_start_menu_.CreateUniqueTempDir());
     ASSERT_TRUE(fake_common_start_menu_.CreateUniqueTempDir());
     user_desktop_override_.reset(
         new base::ScopedPathOverride(base::DIR_USER_DESKTOP,
                                      fake_user_desktop_.path()));
     common_desktop_override_.reset(
         new base::ScopedPathOverride(base::DIR_COMMON_DESKTOP,
                                      fake_common_desktop_.path()));
     user_quick_launch_override_.reset(
         new base::ScopedPathOverride(base::DIR_USER_QUICK_LAUNCH,
                                      fake_user_quick_launch_.path()));
-    default_user_quick_launch_override_.reset(
-        new base::ScopedPathOverride(base::DIR_DEFAULT_USER_QUICK_LAUNCH,
-                                     fake_default_user_quick_launch_.path()));
     start_menu_override_.reset(
         new base::ScopedPathOverride(base::DIR_START_MENU,
                                      fake_start_menu_.path()));
     common_start_menu_override_.reset(
         new base::ScopedPathOverride(base::DIR_COMMON_START_MENU,
                                      fake_common_start_menu_.path()));
 
     base::string16 shortcut_name(
         dist_->GetShortcutName(BrowserDistribution::SHORTCUT_CHROME) +
         installer::kLnkExt);
     base::string16 alternate_shortcut_name(
         dist_->GetShortcutName(BrowserDistribution::SHORTCUT_CHROME_ALTERNATE) +
         installer::kLnkExt);
 
     user_desktop_shortcut_ =
         fake_user_desktop_.path().Append(shortcut_name);
     user_quick_launch_shortcut_ =
         fake_user_quick_launch_.path().Append(shortcut_name);
     user_start_menu_shortcut_ =
         fake_start_menu_.path().Append(
             dist_->GetStartMenuShortcutSubfolder(
                 BrowserDistribution::SUBFOLDER_CHROME))
         .Append(shortcut_name);
     system_desktop_shortcut_ =
         fake_common_desktop_.path().Append(shortcut_name);
-    system_quick_launch_shortcut_ =
-        fake_default_user_quick_launch_.path().Append(shortcut_name);
     system_start_menu_shortcut_ =
         fake_common_start_menu_.path().Append(
             dist_->GetStartMenuShortcutSubfolder(
                 BrowserDistribution::SUBFOLDER_CHROME))
         .Append(shortcut_name);
     user_alternate_desktop_shortcut_ =
         fake_user_desktop_.path().Append(alternate_shortcut_name);
   }
 
   virtual void TearDown() OVERRIDE {
@@ skipping 39 matching lines @@
 
   BrowserDistribution* dist_;
   base::FilePath chrome_exe_;
   scoped_ptr<installer::Product> product_;
   scoped_ptr<installer::MasterPreferences> prefs_;
 
   base::ScopedTempDir temp_dir_;
   base::ScopedTempDir fake_user_desktop_;
   base::ScopedTempDir fake_common_desktop_;
   base::ScopedTempDir fake_user_quick_launch_;
-  base::ScopedTempDir fake_default_user_quick_launch_;
   base::ScopedTempDir fake_start_menu_;
   base::ScopedTempDir fake_common_start_menu_;
   scoped_ptr<base::ScopedPathOverride> user_desktop_override_;
   scoped_ptr<base::ScopedPathOverride> common_desktop_override_;
   scoped_ptr<base::ScopedPathOverride> user_quick_launch_override_;
-  scoped_ptr<base::ScopedPathOverride> default_user_quick_launch_override_;
   scoped_ptr<base::ScopedPathOverride> start_menu_override_;
   scoped_ptr<base::ScopedPathOverride> common_start_menu_override_;
 
   base::FilePath user_desktop_shortcut_;
   base::FilePath user_quick_launch_shortcut_;
   base::FilePath user_start_menu_shortcut_;
   base::FilePath system_desktop_shortcut_;
-  base::FilePath system_quick_launch_shortcut_;
   base::FilePath system_start_menu_shortcut_;
   base::FilePath user_alternate_desktop_shortcut_;
 };
 
 }  // namespace
 
 // Test that VisualElementsManifest.xml is not created when VisualElements are
 // not present.
 TEST_F(CreateVisualElementsManifestTest, VisualElementsManifestNotCreated) {
   ASSERT_TRUE(
@@ skipping 34 matching lines @@
   installer::CreateOrUpdateShortcuts(
       chrome_exe_, *product_, *prefs_, installer::CURRENT_USER,
       installer::INSTALL_SHORTCUT_CREATE_ALL);
   base::win::ValidateShortcut(user_desktop_shortcut_, expected_properties_);
   base::win::ValidateShortcut(user_quick_launch_shortcut_,
                               expected_properties_);
   base::win::ValidateShortcut(user_start_menu_shortcut_,
                               expected_start_menu_properties_);
 }
 
-// Disabled failing test; http://crbug.com/329239.
-TEST_F(InstallShortcutTest, DISABLED_CreateAllShortcutsSystemLevel) {
+TEST_F(InstallShortcutTest, CreateAllShortcutsSystemLevel) {
   installer::CreateOrUpdateShortcuts(
       chrome_exe_, *product_, *prefs_, installer::ALL_USERS,
       installer::INSTALL_SHORTCUT_CREATE_ALL);
   base::win::ValidateShortcut(system_desktop_shortcut_, expected_properties_);
-  base::win::ValidateShortcut(system_quick_launch_shortcut_,
-                              expected_properties_);
   base::win::ValidateShortcut(system_start_menu_shortcut_,
                               expected_start_menu_properties_);
+  // The quick launch shortcut is always created per-user for the admin running
+  // the install (other users will get it via Active Setup).
+  base::win::ValidateShortcut(user_quick_launch_shortcut_,
+                              expected_properties_);
 }
 
 TEST_F(InstallShortcutTest, CreateAllShortcutsAlternateDesktopName) {
   scoped_ptr<installer::MasterPreferences> prefs_alt_desktop(
       GetFakeMasterPrefs(false, false, true));
   installer::CreateOrUpdateShortcuts(
       chrome_exe_, *product_, *prefs_alt_desktop, installer::CURRENT_USER,
       installer::INSTALL_SHORTCUT_CREATE_ALL);
   base::win::ValidateShortcut(user_alternate_desktop_shortcut_,
                               expected_properties_);
@@ skipping 82 matching lines @@
 
 TEST_F(InstallShortcutTest, CreateIfNoSystemLevelAllSystemShortcutsExist) {
   base::win::ShortcutProperties dummy_properties;
   base::FilePath dummy_target;
   ASSERT_TRUE(base::CreateTemporaryFileInDir(temp_dir_.path(), &dummy_target));
   dummy_properties.set_target(dummy_target);
 
   ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
                   system_desktop_shortcut_, dummy_properties,
                   base::win::SHORTCUT_CREATE_ALWAYS));
-  ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
-                  system_quick_launch_shortcut_, dummy_properties,
-                  base::win::SHORTCUT_CREATE_ALWAYS));
   ASSERT_TRUE(base::CreateDirectory(
         system_start_menu_shortcut_.DirName()));
   ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
                   system_start_menu_shortcut_, dummy_properties,
                   base::win::SHORTCUT_CREATE_ALWAYS));
 
   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_));
-  ASSERT_FALSE(base::PathExists(user_quick_launch_shortcut_));
   ASSERT_FALSE(base::PathExists(user_start_menu_shortcut_));
+  // There is no system-level quick launch shortcut, so creating the user-level
+  // one should always succeed.
+  ASSERT_TRUE(base::PathExists(user_quick_launch_shortcut_));
 }
 
 TEST_F(InstallShortcutTest, CreateIfNoSystemLevelNoSystemShortcutsExist) {
   installer::CreateOrUpdateShortcuts(
       chrome_exe_, *product_, *prefs_, installer::CURRENT_USER,
       installer::INSTALL_SHORTCUT_CREATE_EACH_IF_NO_SYSTEM_LEVEL);
   base::win::ValidateShortcut(user_desktop_shortcut_, expected_properties_);
   base::win::ValidateShortcut(user_quick_launch_shortcut_,
                               expected_properties_);
   base::win::ValidateShortcut(user_start_menu_shortcut_,
@@ skipping 27 matching lines @@
   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());
 }