| OLD | NEW |
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/installer/setup/setup_install_details.h" | 5 #include "chrome/installer/setup/setup_install_details.h" |
| 6 | 6 |
| 7 #include <windows.h> | 7 #include <windows.h> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 { | 66 { |
| 67 L"setup.exe", // User-level, primary mode. | 67 L"setup.exe", // User-level, primary mode. |
| 68 L"", // New install. | 68 L"", // New install. |
| 69 L"1.1-beta", // Beta channel. | 69 L"1.1-beta", // Beta channel. |
| 70 L"x64-stable", // Value ignored in binaries. | 70 L"x64-stable", // Value ignored in binaries. |
| 71 install_static::STABLE_INDEX, // Expect primary mode. | 71 install_static::STABLE_INDEX, // Expect primary mode. |
| 72 false, // Expect user-level. | 72 false, // Expect user-level. |
| 73 L"beta", // Expect beta channel. | 73 L"beta", // Expect beta channel. |
| 74 }, | 74 }, |
| 75 { | 75 { |
| 76 L"setup.exe --chrome-beta", // User-level, secondary SxS beta mode. | |
| 77 L"", // New install. | |
| 78 L"", // Unused. | |
| 79 L"", // Unused. | |
| 80 install_static::BETA_INDEX, // Expect SxS beta mode. | |
| 81 false, // Expect user-level. | |
| 82 L"beta", // Expect beta channel. | |
| 83 }, | |
| 84 { | |
| 85 L"setup.exe --chrome-beta", // User-level, secondary SxS beta mode. | |
| 86 L"--uninstall --chrome-beta", // Update. | |
| 87 L"", // Unused. | |
| 88 L"", // Unused. | |
| 89 install_static::BETA_INDEX, // Expect SxS beta mode. | |
| 90 false, // Expect user-level. | |
| 91 L"beta", // Expect beta channel. | |
| 92 }, | |
| 93 { | |
| 94 L"setup.exe --chrome-dev", // User-level, secondary SxS dev mode. | |
| 95 L"", // New install. | |
| 96 L"", // Unused. | |
| 97 L"", // Unused. | |
| 98 install_static::DEV_INDEX, // Expect SxS dev mode. | |
| 99 false, // Expect user-level. | |
| 100 L"dev", // Expect dev channel. | |
| 101 }, | |
| 102 { | |
| 103 L"setup.exe --chrome-dev", // User-level, secondary SxS dev mode. | |
| 104 L"--uninstall --chrome-dev", // Update. | |
| 105 L"", // Unused. | |
| 106 L"", // Unused. | |
| 107 install_static::DEV_INDEX, // Expect SxS dev mode. | |
| 108 false, // Expect user-level. | |
| 109 L"dev", // Expect dev channel. | |
| 110 }, | |
| 111 { | |
| 112 L"setup.exe --chrome-sxs", // User-level, secondary SxS canary mode. | 76 L"setup.exe --chrome-sxs", // User-level, secondary SxS canary mode. |
| 113 L"", // New install. | 77 L"", // New install. |
| 114 L"", // Unused. | 78 L"", // Unused. |
| 115 L"", // Unused. | 79 L"", // Unused. |
| 116 install_static::CANARY_INDEX, // Expect SxS canary mode. | 80 install_static::CANARY_INDEX, // Expect SxS canary mode. |
| 117 false, // Expect user-level. | 81 false, // Expect user-level. |
| 118 L"canary", // Expect canary channel. | 82 L"canary", // Expect canary channel. |
| 119 }, | 83 }, |
| 120 { | 84 { |
| 121 L"setup.exe --chrome-sxs", // User-level, secondary SxS canary mode. | 85 L"setup.exe --chrome-sxs", // User-level, secondary SxS canary mode. |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 }, | 122 }, |
| 159 { | 123 { |
| 160 L"setup.exe --system-level", // System-level, primary mode. | 124 L"setup.exe --system-level", // System-level, primary mode. |
| 161 L"", // New install. | 125 L"", // New install. |
| 162 L"1.1-beta", // Beta channel. | 126 L"1.1-beta", // Beta channel. |
| 163 L"x64-stable", // Value ignored in binaries. | 127 L"x64-stable", // Value ignored in binaries. |
| 164 install_static::STABLE_INDEX, // Expect primary mode. | 128 install_static::STABLE_INDEX, // Expect primary mode. |
| 165 true, // Expect system-level. | 129 true, // Expect system-level. |
| 166 L"beta", // Expect beta channel. | 130 L"beta", // Expect beta channel. |
| 167 }, | 131 }, |
| 168 { | |
| 169 L"setup.exe --system-level --chrome-beta", // User-level, secondary SxS | |
| 170 // beta mode. | |
| 171 L"", // New install. | |
| 172 L"", // Unused. | |
| 173 L"", // Unused. | |
| 174 install_static::BETA_INDEX, // Expect SxS beta mode. | |
| 175 true, // Expect user-level. | |
| 176 L"beta", // Expect beta channel. | |
| 177 }, | |
| 178 { | |
| 179 L"setup.exe --system-level --chrome-beta", // User-level, secondary SxS | |
| 180 // beta mode. | |
| 181 L"--uninstall --system-level --chrome-beta", // Update. | |
| 182 L"", // Unused. | |
| 183 L"", // Unused. | |
| 184 install_static::BETA_INDEX, // Expect SxS beta mode. | |
| 185 true, // Expect user-level. | |
| 186 L"beta", // Expect beta channel. | |
| 187 }, | |
| 188 { | |
| 189 L"setup.exe --system-level --chrome-dev", // User-level, secondary SxS | |
| 190 // dev mode. | |
| 191 L"", // New install. | |
| 192 L"", // Unused. | |
| 193 L"", // Unused. | |
| 194 install_static::DEV_INDEX, // Expect SxS dev mode. | |
| 195 true, // Expect user-level. | |
| 196 L"dev", // Expect dev channel. | |
| 197 }, | |
| 198 { | |
| 199 L"setup.exe --system-level --chrome-dev", // User-level, secondary SxS | |
| 200 // dev mode. | |
| 201 L"--uninstall --system-level --chrome-dev", // Update. | |
| 202 L"", // Unused. | |
| 203 L"", // Unused. | |
| 204 install_static::DEV_INDEX, // Expect SxS dev mode. | |
| 205 true, // Expect user-level. | |
| 206 L"dev", // Expect dev channel. | |
| 207 }, | |
| 208 }; | 132 }; |
| 209 #else // GOOGLE_CHROME_BUILD | 133 #else // GOOGLE_CHROME_BUILD |
| 210 constexpr TestData kTestData[] = { | 134 constexpr TestData kTestData[] = { |
| 211 // User-level test cases. | 135 // User-level test cases. |
| 212 { | 136 { |
| 213 L"setup.exe", // User-level, primary mode. | 137 L"setup.exe", // User-level, primary mode. |
| 214 L"", // New install. | 138 L"", // New install. |
| 215 L"", // Channels are not supported. | 139 L"", // Channels are not supported. |
| 216 L"", // Channels are not supported. | 140 L"", // Channels are not supported. |
| 217 install_static::CHROMIUM_INDEX, // Expect primary mode. | 141 install_static::CHROMIUM_INDEX, // Expect primary mode. |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 357 std::unique_ptr<install_static::PrimaryInstallDetails> details( | 281 std::unique_ptr<install_static::PrimaryInstallDetails> details( |
| 358 MakeInstallDetails(command_line(), master_preferences())); | 282 MakeInstallDetails(command_line(), master_preferences())); |
| 359 EXPECT_THAT(details->install_mode_index(), Eq(test_data().index)); | 283 EXPECT_THAT(details->install_mode_index(), Eq(test_data().index)); |
| 360 EXPECT_THAT(details->system_level(), Eq(test_data().system_level)); | 284 EXPECT_THAT(details->system_level(), Eq(test_data().system_level)); |
| 361 EXPECT_THAT(details->channel(), Eq(test_data().channel)); | 285 EXPECT_THAT(details->channel(), Eq(test_data().channel)); |
| 362 } | 286 } |
| 363 | 287 |
| 364 INSTANTIATE_TEST_CASE_P(All, | 288 INSTANTIATE_TEST_CASE_P(All, |
| 365 MakeInstallDetailsTest, | 289 MakeInstallDetailsTest, |
| 366 testing::ValuesIn(kTestData)); | 290 testing::ValuesIn(kTestData)); |
| OLD | NEW |