Revert 148046 - Revert 147650 - Implement installation of the Chrome App Host.

chrome/installer/util/installation_validator_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 <map>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
@@ skipping 60 matching lines @@
 
 class FakeProductState : public ProductState {
  public:
   void SetChannel(const wchar_t* base, int channel_modifiers);
   void SetVersion(const char* version);
   void SetUninstallCommand(BrowserDistribution::Type dist_type,
                            Level install_level,
                            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;
   }
   installer::AppCommands& commands() { return commands_; }
 
  protected:
   struct ChannelMethodForModifier {
     ChannelModifier modifier;
     bool (ChannelInfo::*method)(bool value);
   };
@@ skipping 91 matching lines @@
             installer::switches::kChromeFrameReadyMode);
       }
     }
   } else if (dist_type == BrowserDistribution::CHROME_FRAME) {
     uninstall_command_.AppendSwitch(installer::switches::kChromeFrame);
   }
   if (vehicle == MSI)
     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,
     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);
   if (install_level == SYSTEM_LEVEL)
     cmd_line.AppendSwitch(installer::switches::kSystemLevel);
   cmd_line.AppendSwitch(installer::switches::kChromeFrameQuickEnable);
   commands_.Set(installer::kCmdQuickEnableCf,
                 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
 // validator are sent to an optional mock recipient (see
 // set_validation_error_recipient) upon which expectations can be placed.
 class InstallationValidatorTest
     : public testing::TestWithParam<InstallationValidator::InstallationType> {
  public:
 
   // These shouldn't need to be public, but there seems to be some interaction
@@ skipping 171 matching lines @@
   state->SetUninstallCommand(prod_type, install_level, chrome::kChromeVersion,
                              channel_modifiers, vehicle);
   state->set_multi_install(is_multi_install);
   if (prod_type == BrowserDistribution::CHROME_BINARIES &&
       (inst_type == InstallationValidator::CHROME_MULTI ||
        inst_type ==
            InstallationValidator::CHROME_FRAME_READY_MODE_CHROME_MULTI)) {
     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
 // Populates |state| with the state of a valid installation of |inst_type|.
 void InstallationValidatorTest::MakeMachineState(
     InstallationValidator::InstallationType inst_type,
     Level install_level,
     Channel channel,
     Vehicle vehicle,
     FakeInstallationState* state) {
@@ skipping 61 matching lines @@
     InstallationValidatorTest,
     Values(InstallationValidator::NO_PRODUCTS,
            InstallationValidator::CHROME_SINGLE,
            InstallationValidator::CHROME_MULTI,
            InstallationValidator::CHROME_FRAME_SINGLE,
            InstallationValidator::CHROME_FRAME_SINGLE_CHROME_SINGLE,
            InstallationValidator::CHROME_FRAME_SINGLE_CHROME_MULTI,
            InstallationValidator::CHROME_FRAME_MULTI,
            InstallationValidator::CHROME_FRAME_MULTI_CHROME_MULTI,
            InstallationValidator::CHROME_FRAME_READY_MODE_CHROME_MULTI));