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

chrome/installer/util/channel_info.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 "base/logging.h"
 #include "base/win/registry.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/util_constants.h"
 
 using base::win::RegKey;
 
 namespace {
 
 const wchar_t kModChrome[] = L"-chrome";
 const wchar_t kModChromeFrame[] = L"-chromeframe";
-// TODO(huangs): Remove by M27.
-const wchar_t kModAppHostDeprecated[] = L"-apphost";

[grt (UTC plus 2), 2014/12/18 19:27:37]

we're still getting update checks containing -apphost and -applauncher. please
add to the cleanup code that runs on each install/update a call to remove both
values.

[huangs, 2015/01/05 06:01:12]

Updated, with refactoring to ChannelInfo:
- Replaced all std::wstring usage with base::string16.
- Adding static ChannelInfo::AuditValue() (which contains the call to remove
-apphost and -applauncher), which gets called by Initialize() and set_value().
- Moved set_value() etc. from .h to .cc.
- Updated unit tests.

-const wchar_t kModAppLauncher[] = L"-applauncher";
 const wchar_t kModMultiInstall[] = L"-multi";
 const wchar_t kModReadyMode[] = L"-readymode";
 const wchar_t kModStage[] = L"-stage:";
 const wchar_t kSfxFull[] = L"-full";
 const wchar_t kSfxMigrating[] = L"-migrating";
 const wchar_t kSfxMultiFail[] = L"-multifail";
 
 const wchar_t* const kChannels[] = {
   installer::kChromeChannelBeta,
   installer::kChromeChannelDev,
   installer::kChromeChannelStableExplicit
 };
 
 const wchar_t* const kModifiers[] = {
   kModStage,
   kModMultiInstall,
   kModChrome,
   kModChromeFrame,
-  kModAppHostDeprecated,  // TODO(huangs): Remove by M27.
-  kModAppLauncher,
   kModReadyMode,
   kSfxMultiFail,
   kSfxMigrating,
   kSfxFull,
 };
 
 enum ModifierIndex {
   MOD_STAGE,
   MOD_MULTI_INSTALL,
   MOD_CHROME,
   MOD_CHROME_FRAME,
-  MOD_APP_HOST_DEPRECATED,  // TODO(huangs): Remove by M27.
-  MOD_APP_LAUNCHER,
   MOD_READY_MODE,
   SFX_MULTI_FAIL,
   SFX_MIGRATING,
   SFX_FULL,
   NUM_MODIFIERS
 };
 
 COMPILE_ASSERT(NUM_MODIFIERS == arraysize(kModifiers),
     kModifiers_disagrees_with_ModifierIndex_comma_they_must_match_bang);
 
@@ skipping 137 matching lines @@
 }
 
 bool ChannelInfo::IsChromeFrame() const {
   return HasModifier(MOD_CHROME_FRAME, value_);
 }
 
 bool ChannelInfo::SetChromeFrame(bool value) {
   return SetModifier(MOD_CHROME_FRAME, value, &value_);
 }
 
-bool ChannelInfo::IsAppLauncher() const {
-  return HasModifier(MOD_APP_LAUNCHER, value_);
-}
-
-bool ChannelInfo::SetAppLauncher(bool value) {
-  // Unconditionally remove -apphost since it has been deprecated.
-  bool changed_app_host = SetModifier(MOD_APP_HOST_DEPRECATED, false, &value_);
-  bool changed_app_launcher = SetModifier(MOD_APP_LAUNCHER, value, &value_);
-  return changed_app_host || changed_app_launcher;
-}
-
 bool ChannelInfo::IsMultiInstall() const {
   return HasModifier(MOD_MULTI_INSTALL, value_);
 }
 
 bool ChannelInfo::SetMultiInstall(bool value) {
   return SetModifier(MOD_MULTI_INSTALL, value, &value_);
 }
 
 bool ChannelInfo::IsReadyMode() const {
   return HasModifier(MOD_READY_MODE, value_);
@@ skipping 70 matching lines @@
 
   for (int scan = 0; scan < NUM_MODIFIERS; ++scan) {
     ModifierIndex index = static_cast<ModifierIndex>(scan);
     modified = SetModifier(index, false, &value_) || modified;
   }
 
   return modified;
 }
 
 }  // namespace installer