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

Unified Diff: chrome/installer/setup/install_unittest.cc

Issue 2834973002: Revert of Enable side-by-side beta and dev channels. (Closed)
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: chrome/installer/setup/install_unittest.cc
diff --git a/chrome/installer/setup/install_unittest.cc b/chrome/installer/setup/install_unittest.cc
index da1e76e0867fdb1ea2d61396d419260ba8cc40d3..c26980a69eb0f92676a6fcc96de57b5b42d6deca 100644
--- a/chrome/installer/setup/install_unittest.cc
+++ b/chrome/installer/setup/install_unittest.cc
@@ -102,28 +102,6 @@
"</Application>\r\n";
#if defined(GOOGLE_CHROME_BUILD)
-constexpr char kExpectedBetaManifest[] =
- "<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>\r\n"
- " <VisualElements\r\n"
- " ShowNameOnSquare150x150Logo='on'\r\n"
- " Square150x150Logo='0.0.0.0\\VisualElements\\LogoBeta.png'\r\n"
- " Square70x70Logo='0.0.0.0\\VisualElements\\SmallLogoBeta.png'\r\n"
- " Square44x44Logo='0.0.0.0\\VisualElements\\SmallLogoBeta.png'\r\n"
- " ForegroundText='light'\r\n"
- " BackgroundColor='#212121'/>\r\n"
- "</Application>\r\n";
-
-constexpr char kExpectedDevManifest[] =
- "<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>\r\n"
- " <VisualElements\r\n"
- " ShowNameOnSquare150x150Logo='on'\r\n"
- " Square150x150Logo='0.0.0.0\\VisualElements\\LogoDev.png'\r\n"
- " Square70x70Logo='0.0.0.0\\VisualElements\\SmallLogoDev.png'\r\n"
- " Square44x44Logo='0.0.0.0\\VisualElements\\SmallLogoDev.png'\r\n"
- " ForegroundText='light'\r\n"
- " BackgroundColor='#212121'/>\r\n"
- "</Application>\r\n";
-
constexpr char kExpectedCanaryManifest[] =
"<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>\r\n"
" <VisualElements\r\n"
@@ -140,16 +118,6 @@
CreateVisualElementsManifestTest,
testing::Combine(testing::Values(install_static::STABLE_INDEX),
testing::Values(kExpectedPrimaryManifest)));
-INSTANTIATE_TEST_CASE_P(
- BetaChrome,
- CreateVisualElementsManifestTest,
- testing::Combine(testing::Values(install_static::BETA_INDEX),
- testing::Values(kExpectedBetaManifest)));
-INSTANTIATE_TEST_CASE_P(
- DevChrome,
- CreateVisualElementsManifestTest,
- testing::Combine(testing::Values(install_static::DEV_INDEX),
- testing::Values(kExpectedDevManifest)));
INSTANTIATE_TEST_CASE_P(
CanaryChrome,
CreateVisualElementsManifestTest,
« no previous file with comments | « chrome/installer/mini_installer/configuration_test.cc ('k') | chrome/installer/setup/setup_install_details_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698