Revert of Enable side-by-side beta and dev channels.

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 "chrome/installer/setup/install.h"
 
 #include <objbase.h>
 #include <stddef.h>
 
 #include <memory>
@@ skipping 84 matching lines @@
     "  <VisualElements\r\n"
     "      ShowNameOnSquare150x150Logo='on'\r\n"
     "      Square150x150Logo='0.0.0.0\\VisualElements\\Logo.png'\r\n"
     "      Square70x70Logo='0.0.0.0\\VisualElements\\SmallLogo.png'\r\n"
     "      Square44x44Logo='0.0.0.0\\VisualElements\\SmallLogo.png'\r\n"
     "      ForegroundText='light'\r\n"
     "      BackgroundColor='#212121'/>\r\n"
     "</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"
     "      ShowNameOnSquare150x150Logo='on'\r\n"
     "      Square150x150Logo='0.0.0.0\\VisualElements\\LogoCanary.png'\r\n"
     "      Square70x70Logo='0.0.0.0\\VisualElements\\SmallLogoCanary.png'\r\n"
     "      Square44x44Logo='0.0.0.0\\VisualElements\\SmallLogoCanary.png'\r\n"
     "      ForegroundText='light'\r\n"
     "      BackgroundColor='#212121'/>\r\n"
     "</Application>\r\n";
 
 INSTANTIATE_TEST_CASE_P(
     GoogleChrome,
     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,
     testing::Combine(testing::Values(install_static::CANARY_INDEX),
                      testing::Values(kExpectedCanaryManifest)));
 #else
 INSTANTIATE_TEST_CASE_P(
     Chromium,
     CreateVisualElementsManifestTest,
     testing::Combine(testing::Values(install_static::CHROMIUM_INDEX),
                      testing::Values(kExpectedPrimaryManifest)));
@@ skipping 386 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());
 }