Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(515)

Side by Side Diff: chrome/installer/util/beacons_unittest.cc

Issue 2802713002: Enable side-by-side beta and dev channels. (Closed)
Patch Set: add missing test stanza for reland Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/util/beacons.h" 5 #include "chrome/installer/util/beacons.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <tuple> 8 #include <tuple>
9 9
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 ASSERT_FALSE(first_not_default->Get().is_null()); 218 ASSERT_FALSE(first_not_default->Get().is_null());
219 } 219 }
220 220
221 #if defined(GOOGLE_CHROME_BUILD) 221 #if defined(GOOGLE_CHROME_BUILD)
222 // Stable supports user and system levels. 222 // Stable supports user and system levels.
223 INSTANTIATE_TEST_CASE_P( 223 INSTANTIATE_TEST_CASE_P(
224 Stable, 224 Stable,
225 DefaultBrowserBeaconTest, 225 DefaultBrowserBeaconTest,
226 testing::Combine(testing::Values(install_static::STABLE_INDEX), 226 testing::Combine(testing::Values(install_static::STABLE_INDEX),
227 testing::Values("user", "system"))); 227 testing::Values("user", "system")));
228 // Beta supports user and system levels.
229 INSTANTIATE_TEST_CASE_P(
230 Beta,
231 DefaultBrowserBeaconTest,
232 testing::Combine(testing::Values(install_static::BETA_INDEX),
233 testing::Values("user", "system")));
234 // Dev supports user and system levels.
235 INSTANTIATE_TEST_CASE_P(
236 Dev,
237 DefaultBrowserBeaconTest,
238 testing::Combine(testing::Values(install_static::DEV_INDEX),
239 testing::Values("user", "system")));
228 // Canary is only at user level. 240 // Canary is only at user level.
229 INSTANTIATE_TEST_CASE_P( 241 INSTANTIATE_TEST_CASE_P(
230 Canary, 242 Canary,
231 DefaultBrowserBeaconTest, 243 DefaultBrowserBeaconTest,
232 testing::Combine(testing::Values(install_static::CANARY_INDEX), 244 testing::Combine(testing::Values(install_static::CANARY_INDEX),
233 testing::Values("user"))); 245 testing::Values("user")));
234 #else // GOOGLE_CHROME_BUILD 246 #else // GOOGLE_CHROME_BUILD
235 // Chromium supports user and system levels. 247 // Chromium supports user and system levels.
236 INSTANTIATE_TEST_CASE_P( 248 INSTANTIATE_TEST_CASE_P(
237 Chromium, 249 Chromium,
238 DefaultBrowserBeaconTest, 250 DefaultBrowserBeaconTest,
239 testing::Combine(testing::Values(install_static::CHROMIUM_INDEX), 251 testing::Combine(testing::Values(install_static::CHROMIUM_INDEX),
240 testing::Values("user", "system"))); 252 testing::Values("user", "system")));
241 #endif // GOOGLE_CHROME_BUILD 253 #endif // GOOGLE_CHROME_BUILD
242 254
243 } // namespace installer_util 255 } // namespace installer_util
OLDNEW
« no previous file with comments | « chrome/installer/setup/setup_install_details_unittest.cc ('k') | chrome/installer/util/l10n_string_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698