Follow up to https://codereview.chromium.org/1581473002 for Metro removal in installer

chrome/installer/util/shell_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/shell_util.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 84 matching lines @@
         new base::ScopedPathOverride(base::DIR_COMMON_START_MENU,
                                      fake_common_start_menu_.path()));
 
     base::FilePath icon_path;
     base::CreateTemporaryFileInDir(temp_dir_.path(), &icon_path);
     test_properties_.set_target(chrome_exe_);
     test_properties_.set_arguments(L"--test --chrome");
     test_properties_.set_description(L"Makes polar bears dance.");
     test_properties_.set_icon(icon_path, 7);
     test_properties_.set_app_id(L"Polar.Bear");
-    test_properties_.set_dual_mode(true);
   }
 
   // Returns the expected path of a test shortcut. Returns an empty FilePath on
   // failure.
   base::FilePath GetExpectedShortcutPath(
       ShellUtil::ShortcutLocation location,
       BrowserDistribution* dist,
       const ShellUtil::ShortcutProperties& properties) {
     base::FilePath expected_path;
     switch (location) {
@@ skipping 64 matching lines @@
       expected_properties.set_icon(chrome_exe_, icon_index);
     }
 
     if (properties.has_app_id()) {
       expected_properties.set_app_id(properties.app_id);
     } else {
       // Tests are always seen as user-level installs in ShellUtil.
       expected_properties.set_app_id(ShellUtil::GetBrowserModelId(dist, true));
     }
 
-    if (properties.has_dual_mode())
-      expected_properties.set_dual_mode(properties.dual_mode);
-    else
-      expected_properties.set_dual_mode(false);
-
     base::win::ValidateShortcut(expected_path, expected_properties);
   }
 
   BrowserDistribution* dist_;
   scoped_ptr<installer::Product> product_;
 
   // A ShellUtil::ShortcutProperties object with common properties set already.
   ShellUtil::ShortcutProperties test_properties_;
 
   base::ScopedTempDir temp_dir_;
@@ skipping 115 matching lines @@
   new_properties.set_arguments(L"--new-arguments");
   ASSERT_TRUE(ShellUtil::CreateOrUpdateShortcut(
                   ShellUtil::SHORTCUT_LOCATION_DESKTOP,
                   dist_, new_properties,
                   ShellUtil::SHELL_SHORTCUT_REPLACE_EXISTING));
 
   // Expect the properties set in |new_properties| to be set as above and
   // properties that don't have a default value to be set back to their default
   // (as validated in ValidateChromeShortcut()) or unset if they don't .
   ShellUtil::ShortcutProperties expected_properties(new_properties);
-  expected_properties.set_dual_mode(false);
 
   ValidateChromeShortcut(ShellUtil::SHORTCUT_LOCATION_DESKTOP, dist_,
                          expected_properties);
 }
 
 TEST_F(ShellUtilShortcutTest, UpdateQuickLaunchShortcutArguments) {
   ASSERT_TRUE(ShellUtil::CreateOrUpdateShortcut(
                   ShellUtil::SHORTCUT_LOCATION_QUICK_LAUNCH,
                   dist_, test_properties_,
                   ShellUtil::SHELL_SHORTCUT_CREATE_ALWAYS));
 
   // Only changing one property, don't need all the defaults.
   ShellUtil::ShortcutProperties updated_properties(ShellUtil::CURRENT_USER);
   updated_properties.set_arguments(L"--updated --arguments");
   ASSERT_TRUE(ShellUtil::CreateOrUpdateShortcut(
                   ShellUtil::SHORTCUT_LOCATION_QUICK_LAUNCH,
                   dist_, updated_properties,
                   ShellUtil::SHELL_SHORTCUT_UPDATE_EXISTING));
 
   // Expect the properties set in |updated_properties| to be set as above and
   // all other properties to remain unchanged.
   ShellUtil::ShortcutProperties expected_properties(test_properties_);
   expected_properties.set_arguments(updated_properties.arguments);
 
   ValidateChromeShortcut(ShellUtil::SHORTCUT_LOCATION_QUICK_LAUNCH, dist_,
                          expected_properties);
 }
 
-TEST_F(ShellUtilShortcutTest, UpdateAddDualModeToStartMenuShortcut) {
-  ShellUtil::ShortcutProperties properties(ShellUtil::CURRENT_USER);
-  product_->AddDefaultShortcutProperties(chrome_exe_, &properties);
-  ASSERT_TRUE(
-      ShellUtil::CreateOrUpdateShortcut(
-          ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR_DEPRECATED, dist_,
-          properties, ShellUtil::SHELL_SHORTCUT_CREATE_ALWAYS));
-
-  ShellUtil::ShortcutProperties added_properties(ShellUtil::CURRENT_USER);
-  added_properties.set_dual_mode(true);
-  ASSERT_TRUE(
-      ShellUtil::CreateOrUpdateShortcut(
-          ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR_DEPRECATED, dist_,
-          added_properties, ShellUtil::SHELL_SHORTCUT_UPDATE_EXISTING));
-
-  ShellUtil::ShortcutProperties expected_properties(properties);
-  expected_properties.set_dual_mode(true);
-
-  ValidateChromeShortcut(
-      ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR_DEPRECATED,
-      dist_, expected_properties);
-}
-
 TEST_F(ShellUtilShortcutTest, CreateIfNoSystemLevel) {
   ASSERT_TRUE(ShellUtil::CreateOrUpdateShortcut(
                   ShellUtil::SHORTCUT_LOCATION_DESKTOP, dist_, test_properties_,
                   ShellUtil::SHELL_SHORTCUT_CREATE_IF_NO_SYSTEM_LEVEL));
   ValidateChromeShortcut(ShellUtil::SHORTCUT_LOCATION_DESKTOP, dist_,
                          test_properties_);
 }
 
 TEST_F(ShellUtilShortcutTest, CreateIfNoSystemLevelWithSystemLevelPresent) {
   base::string16 shortcut_name(
@@ skipping 657 matching lines @@
 
   const base::string16 expected[] = { L"", L"MY", L"MZXQ", L"MZXW6", L"MZXW6YQ",
                                 L"MZXW6YTB", L"MZXW6YTBOI"};
 
   // Run the tests, with one more letter in the input every pass.
   for (size_t i = 0; i < arraysize(expected); ++i) {
     ASSERT_EQ(expected[i],
               ShellUtil::ByteArrayToBase32(test_array, i));
   }
 }