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

chrome/installer/util/master_preferences.cc

Index: chrome/installer/util/master_preferences.cc
diff --git a/chrome/installer/util/master_preferences.cc b/chrome/installer/util/master_preferences.cc
index de4d5529530eea6e8a3803b788153cb78d7ab273..363ebcdfc77791c9ceaa3096f4abe04854c01cb7 100644
--- a/chrome/installer/util/master_preferences.cc
+++ b/chrome/installer/util/master_preferences.cc
@@ -73,7 +73,6 @@ namespace installer {
 MasterPreferences::MasterPreferences() : distribution_(NULL),
                                          preferences_read_from_file_(false),
                                          chrome_(true),
-                                         chrome_app_launcher_(false),
                                          multi_install_(false) {
   InitializeFromCommandLine(*CommandLine::ForCurrentProcess());
 }
@@ -82,7 +81,6 @@ MasterPreferences::MasterPreferences(const CommandLine& cmd_line)
     : distribution_(NULL),
       preferences_read_from_file_(false),
       chrome_(true),
-      chrome_app_launcher_(false),
       multi_install_(false) {
   InitializeFromCommandLine(cmd_line);
 }
@@ -91,7 +89,6 @@ MasterPreferences::MasterPreferences(const base::FilePath& prefs_path)
     : distribution_(NULL),
       preferences_read_from_file_(false),
       chrome_(true),
-      chrome_app_launcher_(false),
       multi_install_(false) {
   std::string json_data;
   // Failure to read the file is ignored as |json_data| will be the empty string
@@ -109,7 +106,6 @@ MasterPreferences::MasterPreferences(const std::string& prefs)
     : distribution_(NULL),
       preferences_read_from_file_(false),
       chrome_(true),
-      chrome_app_launcher_(false),
       multi_install_(false) {
   InitializeFromString(prefs);
 }
@@ -138,10 +134,6 @@ void MasterPreferences::InitializeFromCommandLine(const CommandLine& cmd_line) {
   } translate_switches[] = {
     { installer::switches::kAutoLaunchChrome,
       installer::master_preferences::kAutoLaunchChrome },
-    { installer::switches::kChromeAppHostDeprecated,
-      installer::master_preferences::kChromeAppHostDeprecated },
-    { installer::switches::kChromeAppLauncher,
-      installer::master_preferences::kChromeAppLauncher },
     { installer::switches::kChrome,
       installer::master_preferences::kChrome },
     { installer::switches::kDisableLogging,
@@ -224,20 +216,10 @@ bool MasterPreferences::InitializeFromString(const std::string& json_data) {
 void MasterPreferences::InitializeProductFlags() {
   // Make sure we start out with the correct defaults.
   multi_install_ = false;
-  chrome_app_launcher_ = false;
   chrome_ = true;
 
   GetBool(installer::master_preferences::kMultiInstall, &multi_install_);
 
-  GetBool(installer::master_preferences::kChromeAppLauncher,
-          &chrome_app_launcher_);
-
-  // The deprecated switch --app-host behaves like --app-launcher.
-  bool chrome_app_host = false;
-  GetBool(installer::master_preferences::kChromeAppHostDeprecated,
-          &chrome_app_host);
-  chrome_app_launcher_ = chrome_app_launcher_ || chrome_app_host;
-
   // When multi-install is specified, the checks are pretty simple (in theory):
   // In order to be installed/uninstalled, each product must have its switch
   // present on the command line.