Change shortcut install location to non-subdir.

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/base_paths.h"
 #include "base/files/file_path.h"
@@ skipping 108 matching lines @@
         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(shortcut_name);
+    user_start_menu_subdir_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_start_menu_shortcut_ =
+        fake_common_start_menu_.path().Append(shortcut_name);
+    system_start_menu_subdir_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);
   }
 
   void TearDown() override {
     // Try to unpin potentially pinned shortcuts (although pinning isn't tested,
     // the call itself might still have pinned the Start Menu shortcuts).
     base::win::UnpinShortcutFromTaskbar(user_start_menu_shortcut_);
     base::win::UnpinShortcutFromTaskbar(system_start_menu_shortcut_);
     base::win::UnpinShortcutFromStart(user_start_menu_shortcut_);
+    base::win::UnpinShortcutFromStart(user_start_menu_subdir_shortcut_);
     base::win::UnpinShortcutFromStart(system_start_menu_shortcut_);
+    base::win::UnpinShortcutFromStart(system_start_menu_subdir_shortcut_);

[gab, 2015/10/15 18:55:06]

Also need to add matching UnpinShortcutFromTaskbar() calls above.

[bcwhite, 2015/10/15 20:12:19]

Done.

     CoUninitialize();
   }
 
   installer::MasterPreferences* GetFakeMasterPrefs(
       bool do_not_create_desktop_shortcut,
       bool do_not_create_quick_launch_shortcut,
       bool alternate_desktop_shortcut) {
     const struct {
       const char* pref_name;
       bool is_desired;
@@ skipping 34 matching lines @@
   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> 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 user_start_menu_subdir_shortcut_;
   base::FilePath system_desktop_shortcut_;
   base::FilePath system_start_menu_shortcut_;
+  base::FilePath system_start_menu_subdir_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(
       installer::CreateVisualElementsManifest(test_dir_.path(), version_));
@@ skipping 153 matching lines @@
   ASSERT_TRUE(base::CreateDirectory(user_start_menu_shortcut_.DirName()));
 
   installer::CreateOrUpdateShortcuts(
       chrome_exe_, *product_, *prefs_, installer::CURRENT_USER,
       installer::INSTALL_SHORTCUT_REPLACE_EXISTING);
   base::win::ValidateShortcut(user_desktop_shortcut_, expected_properties_);
   ASSERT_FALSE(base::PathExists(user_quick_launch_shortcut_));
   ASSERT_FALSE(base::PathExists(user_start_menu_shortcut_));
 }
 
+struct ShortcutParams {
+  installer::InstallShortcutOperation operation;
+  installer::InstallShortcutLevel level;
+
+  ShortcutParams(

[gab, 2015/10/15 18:55:06]

Constructor goes before members
(https://google-styleguide.googlecode.com/svn/trunk/cppguide.html#Declaration_...).

[bcwhite, 2015/10/15 20:12:19]

Done.

+    installer::InstallShortcutOperation op,
+    installer::InstallShortcutLevel lev)
+      : operation(op), level(lev) {}
+};
+
+class MigrateShortcutTest : public InstallShortcutTest,
+                            public testing::WithParamInterface<
+                                ShortcutParams> {
+};
+
+TEST_P(MigrateShortcutTest, MigrateAwayFromDeprecatedStartMenuTest) {
+  installer::InstallShortcutOperation shortcut_operation = GetParam().operation;
+  installer::InstallShortcutLevel shortcut_level = GetParam().level;
+  base::win::ShortcutProperties dummy_properties;
+  base::FilePath dummy_target;
+  ASSERT_TRUE(base::CreateTemporaryFileInDir(temp_dir_.path(), &dummy_target));
+  dummy_properties.set_target(expected_properties_.target);
+  dummy_properties.set_working_dir(fake_user_desktop_.path());
+  dummy_properties.set_arguments(L"--dummy --args");
+  dummy_properties.set_app_id(L"El.Dummiest");
+
+  base::FilePath start_menu_shortcut;
+  base::FilePath start_menu_subdir_shortcut;
+  if (shortcut_level == installer::CURRENT_USER) {
+    start_menu_shortcut = user_start_menu_shortcut_;
+    start_menu_subdir_shortcut = user_start_menu_subdir_shortcut_;
+  } else {
+    start_menu_shortcut = system_start_menu_shortcut_;
+    start_menu_subdir_shortcut = system_start_menu_subdir_shortcut_;
+  }
+
+  ASSERT_TRUE(base::CreateDirectory(
+                  start_menu_subdir_shortcut.DirName()));
+  ASSERT_FALSE(base::PathExists(start_menu_subdir_shortcut));
+  ASSERT_TRUE(base::win::CreateOrUpdateShortcutLink(
+                  start_menu_subdir_shortcut, dummy_properties,
+                  base::win::SHORTCUT_CREATE_ALWAYS));
+  ASSERT_TRUE(base::PathExists(start_menu_subdir_shortcut));
+  ASSERT_FALSE(base::PathExists(start_menu_shortcut));
+
+  installer::CreateOrUpdateShortcuts(
+      chrome_exe_, *product_, *prefs_, shortcut_level, shortcut_operation);
+  ASSERT_FALSE(base::PathExists(start_menu_subdir_shortcut));
+  ASSERT_TRUE(base::PathExists(start_menu_shortcut));
+}
+
+INSTANTIATE_TEST_CASE_P(

[gab, 2015/10/15 18:55:06]

Add a comment like:

// Verify that any installer operation for any installation level triggers the
migration.

[bcwhite, 2015/10/15 20:12:19]

Done.

+    MigrateShortcutTests, MigrateShortcutTest,
+    testing::Values(ShortcutParams(installer::INSTALL_SHORTCUT_REPLACE_EXISTING,
+                                   installer::CURRENT_USER),
+                    ShortcutParams(installer::INSTALL_SHORTCUT_CREATE_ALL,
+                                   installer::CURRENT_USER),
+                    ShortcutParams(installer::INSTALL_SHORTCUT_REPLACE_EXISTING,
+                                   installer::ALL_USERS),
+                    ShortcutParams(installer::INSTALL_SHORTCUT_CREATE_ALL,

[gab, 2015/10/15 18:55:06]

Instead of using a custom struct, make your test a
WithParamInterface<std::tr1::tuple<installer::InstallShortcutOperation,
installer::InstallShortcutLevel>> (mapping those to protected const members of
the MigrateShortcutTest fixture).

And then here you can use 
    Combine(Values(INSTALL_SHORTCUT_CREATE_ALL,
                   INSTALL_SHORTCUT_CREATE_EACH_IF_NO_SYSTEM_LEVEL,
                   INSTALL_SHORTCUT_REPLACE_EXISTING),
            Values(CURRENT_USER, ALL_USERS))

e.g.:
https://code.google.com/p/chromium/codesearch#chromium/src/cc/output/gl_rende...

[bcwhite, 2015/10/15 20:12:19]

Nice.  Done.

+                                   installer::ALL_USERS)));
+
 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::CreateDirectory(
@@ skipping 50 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());
 }