[Installer] Cleaning up dead code for App Launcher / App Host installs.

chrome/installer/util/channel_info_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/channel_info.h"
+
 #include <utility>
 
 #include "base/basictypes.h"
-#include "chrome/installer/util/channel_info.h"
 #include "chrome/installer/util/util_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using installer::ChannelInfo;
 
 namespace {
 
-const std::wstring kChannelStable(installer::kChromeChannelStable);
-const std::wstring kChannelBeta(installer::kChromeChannelBeta);
-const std::wstring kChannelDev(installer::kChromeChannelDev);
+const base::string16 kChannelStable(installer::kChromeChannelStable);
+const base::string16 kChannelBeta(installer::kChromeChannelBeta);
+const base::string16 kChannelDev(installer::kChromeChannelDev);
 
 }  // namespace
 
 TEST(ChannelInfoTest, Channels) {
   ChannelInfo ci;
-  std::wstring channel;
+  base::string16 channel;
 
   ci.set_value(L"");
   EXPECT_TRUE(ci.GetChannelName(&channel));
   EXPECT_EQ(kChannelStable, channel);
   ci.set_value(L"-full");
   EXPECT_TRUE(ci.GetChannelName(&channel));
   EXPECT_EQ(kChannelStable, channel);
 
   ci.set_value(L"2.0-beta");
   EXPECT_TRUE(ci.GetChannelName(&channel));
@@ skipping 216 matching lines @@
   ChannelInfo ci;
 
   ci.set_value(L"");
   EXPECT_FALSE(ci.RemoveAllModifiersAndSuffixes());
   EXPECT_EQ(L"", ci.value());
 
   ci.set_value(L"2.0-dev-multi-chrome-chromeframe-migrating");
   EXPECT_TRUE(ci.RemoveAllModifiersAndSuffixes());
   EXPECT_EQ(L"2.0-dev", ci.value());
 }
+
+TEST(ChannelInfoTest, RemoveDepreciatedModifiers) {
+  struct {
+    base::string16 expected;
+    base::string16 input;
+  } test_cases[] = {
+    {L"", L""},
+    {L"-multi", L"-multi"},
+    {L"", L"-apphost"},
+    {L"-multi", L"-multi-apphost"},
+    {L"-multi", L"-apphost-multi"},
+    {L"-multi-stage:spammy", L"-multi-apphost-stage:spammy"},
+    {L"-multi-apphostlike-chrome", L"-multi-apphostlike-chrome"},
+    {L"-multi-APPLAUNCHER-chrome", L"-multi-APPLAUNCHER-chrome"},
+    {L"", L"-apphost-applauncher"},
+    {L"-multi", L"-apphost-multi-applauncher"},
+    {L"2.0-beta-multi-stage", L"2.0-beta-applauncher-multi-apphost-stage"},
+  };
+  for (int i = 0; i < arraysize(test_cases); ++i) {
+    ChannelInfo ci;
+    ci.set_value(test_cases[i].input);
+    EXPECT_EQ(test_cases[i].expected, ci.value())
+        << "test_cases[" << i << "] failed.";
+  }
+}