Revert 147650 - Implement installation of the Chrome App Host.

chrome/installer/util/installation_validator_unittest.cc

Index: chrome/installer/util/installation_validator_unittest.cc
===================================================================
--- chrome/installer/util/installation_validator_unittest.cc	(revision 148045)
+++ chrome/installer/util/installation_validator_unittest.cc	(working copy)
@@ -78,14 +78,11 @@
                            const char* version,
                            int channel_modifiers,
                            Vehicle vehicle);
-  void AddQuickEnableApplicationHostCommand(BrowserDistribution::Type dist_type,
-                                            Level install_level,
-                                            const char* version,
-                                            int channel_modifiers);
   void AddQuickEnableCfCommand(BrowserDistribution::Type dist_type,
                                Level install_level,
                                const char* version,
                                int channel_modifiers);
+  void RemoveQuickEnableCfCommand(BrowserDistribution::Type dist_type);
   void set_multi_install(bool is_multi_install) {
     multi_install_ = is_multi_install;
   }
@@ -197,23 +194,6 @@
     uninstall_command_.AppendSwitch(installer::switches::kMsi);
 }
 
-// Adds the "quick-enable-application-host" Google Update product command.
-void FakeProductState::AddQuickEnableApplicationHostCommand(
-    BrowserDistribution::Type dist_type,
-    Level install_level,
-    const char* version,
-    int channel_modifiers) {
-  DCHECK_EQ(dist_type, BrowserDistribution::CHROME_BINARIES);
-  DCHECK_NE(channel_modifiers & CM_MULTI, 0);
-
-  CommandLine cmd_line(GetSetupExePath(dist_type, install_level, version,
-                                       channel_modifiers));
-  cmd_line.AppendSwitch(installer::switches::kMultiInstall);
-  cmd_line.AppendSwitch(installer::switches::kChromeAppHost);
-  commands_.Set(installer::kCmdQuickEnableApplicationHost,
-                AppCommand(cmd_line.GetCommandLineString(), true, true));
-}
-
 // Adds the "quick-enable-cf" Google Update product command.
 void FakeProductState::AddQuickEnableCfCommand(
     BrowserDistribution::Type dist_type,
@@ -233,6 +213,14 @@
                 AppCommand(cmd_line.GetCommandLineString(), true, true));
 }
 
+// Removes the "quick-enable-cf" Google Update product command.
+void FakeProductState::RemoveQuickEnableCfCommand(
+    BrowserDistribution::Type dist_type) {
+  DCHECK_EQ(dist_type, BrowserDistribution::CHROME_BINARIES);
+
+  commands_.Remove(installer::kCmdQuickEnableCf);
+}
+
 }  // namespace
 
 // Fixture for testing the InstallationValidator.  Errors logged by the
@@ -424,12 +412,6 @@
     state->AddQuickEnableCfCommand(prod_type, install_level,
                                    chrome::kChromeVersion, channel_modifiers);
   }
-  if (prod_type == BrowserDistribution::CHROME_BINARIES) {
-    state->AddQuickEnableApplicationHostCommand(prod_type,
-                                                install_level,
-                                                chrome::kChromeVersion,
-                                                channel_modifiers);
-  }
 }
 
 // static