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

chrome/installer/util/channel_info.h

 // 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.
 
 #ifndef CHROME_INSTALLER_UTIL_CHANNEL_INFO_H_
 #define CHROME_INSTALLER_UTIL_CHANNEL_INFO_H_
 
 #include <string>
 
+#include "base/strings/string16.h"
+
 namespace base {
 namespace win {
 class RegKey;
 }
 }
 
 namespace installer {
 
 // A helper class for parsing and modifying the Google Update additional
 // parameter ("ap") client state value for a product.
 class ChannelInfo {
  public:
 
   // Initialize an instance from the "ap" value in a given registry key.
   // Returns false if the value is present but could not be read from the
   // registry. Returns true if the value was not present or could be read.
   // Also returns true if the key is not valid.
   // An absent "ap" value is treated identically to an empty "ap" value.
   bool Initialize(const base::win::RegKey& key);
 
   // Writes the info to the "ap" value in a given registry key.
   // Returns false if the value could not be written to the registry.
   bool Write(base::win::RegKey* key) const;
 
   const std::wstring& value() const { return value_; }

[grt (UTC plus 2), 2015/01/20 21:30:23]

string16 here and below, and remove #include <string>

[huangs, 2015/01/20 23:26:00]

Done.

   void set_value(const std::wstring& value) { value_ = value; }
   bool Equals(const ChannelInfo& other) const {
     return value_ == other.value_;
   }
 
   // Determines the update channel for the value.  Possible |channel_name|
   // results are the empty string (stable channel), "beta", and "dev".  Returns
   // false (without modifying |channel_name|) if the channel could not be
   // determined.
-  bool GetChannelName(std::wstring* channel_name) const;
+  bool GetChannelName(base::string16* channel_name) const;
 
   // Returns true if the -chrome modifier is present in the value.
   bool IsChrome() const;
 
   // Adds or removes the -chrome modifier, returning true if the value is
   // modified.
   bool SetChrome(bool value);
 
   // Returns true if the -chromeframe modifier is present in the value.
   bool IsChromeFrame() const;
 
   // Adds or removes the -chromeframe modifier, returning true if the value is
   // modified.
   bool SetChromeFrame(bool value);
 
-  // Returns true if the -applauncher modifier is present in the value.
+  // (Deprecated) Returns true if the -applauncher modifier is present in the
+  // value.
   bool IsAppLauncher() const;
 
-  // Adds or removes the -applauncher modifier, returning true if the value is
-  // modified.
+  // (Deprecated) Adds or removes the -applauncher modifier, returning true if
+  // the value is modified.
   bool SetAppLauncher(bool value);
 
   // Returns true if the -multi modifier is present in the value.
   bool IsMultiInstall() const;
 
   // Adds or removes the -multi modifier, returning true if the value is
   // modified.
   bool SetMultiInstall(bool value);
 
   // Returns true if the -readymode modifier is present in the value.
   bool IsReadyMode() const;
 
   // Adds or removes the -readymode modifier, returning true if the value is
   // modified.
   bool SetReadyMode(bool value);
 
   // Adds the -stage: modifier with the given string (if |stage| is non-NULL) or
   // removes the -stage: modifier (otherwise), returning true if the value is
   // modified.
   bool SetStage(const wchar_t* stage);
 
   // Returns the string identifying the current stage, or an empty string if the
   // -stage: modifier is not present in the value.
-  std::wstring GetStage() const;
+  base::string16 GetStage() const;
 
   // Returns true if the -full suffix is present in the value.
   bool HasFullSuffix() const;
 
   // Adds or removes the -full suffix, returning true if the value is
   // modified.
   bool SetFullSuffix(bool value);
 
   // Returns true if the -multifail suffix is present in the value.
   bool HasMultiFailSuffix() const;
 
   // Adds or removes the -multifail suffix, returning true if the value is
   // modified.
   bool SetMultiFailSuffix(bool value);
 
   // Adds or removes the -migrating suffix, returning true if the value is
   // modified.
   bool SetMigratingSuffix(bool value);
 
   // Returns true if the -migrating suffix is present in the value.
   bool HasMigratingSuffix() const;
 
   // Removes all modifiers and suffixes. For example, 2.0-dev-multi-chrome-full
   // becomes 2.0-dev. Returns true if the value is modified.
   bool RemoveAllModifiersAndSuffixes();
 
  private:
-  std::wstring value_;
+  base::string16 value_;
 };  // class ChannelInfo
 
 }  // namespace installer
 
 #endif  // CHROME_INSTALLER_UTIL_CHANNEL_INFO_H_