Implementing app command to query EULA acceptance state for Chrome.

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 72 matching lines @@
                                             const char* version,
                                             int channel_modifiers);
   void AddQuickEnableCfCommand(BrowserDistribution::Type dist_type,
                                Level install_level,
                                const char* version,
                                int channel_modifiers);
   void AddOsUpgradeCommand(BrowserDistribution::Type dist_type,
                            Level install_level,
                            const char* version,
                            int channel_modifiers);
+  void AddQueryEULAAcceptanceCommand(BrowserDistribution::Type dist_type,
+                                     Level install_level,
+                                     const char* version,
+                                     int channel_modifiers);
   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 156 matching lines @@
     cmd_line.AppendSwitch(installer::switches::kChrome);
   }
   if (install_level == SYSTEM_LEVEL)
     cmd_line.AppendSwitch(installer::switches::kSystemLevel);
   cmd_line.AppendSwitch(installer::switches::kVerboseLogging);
   AppCommand app_cmd(cmd_line.GetCommandLineString());
   app_cmd.set_is_auto_run_on_os_upgrade(true);
   commands_.Set(installer::kCmdOnOsUpgrade, app_cmd);
 }
 
+// Adds the "query-eula-acceptance" Google Update product command.
+void FakeProductState::AddQueryEULAAcceptanceCommand(
+    BrowserDistribution::Type dist_type,
+    Level install_level,
+    const char* version,
+    int channel_modifiers) {
+  DCHECK_EQ(dist_type, BrowserDistribution::CHROME_BINARIES);
+
+  CommandLine cmd_line(GetSetupExePath(dist_type, install_level, version,
+                                       channel_modifiers));
+  cmd_line.AppendSwitch(installer::switches::kQueryEULAAccepetance);
+  if (install_level == SYSTEM_LEVEL)
+    cmd_line.AppendSwitch(installer::switches::kSystemLevel);
+  cmd_line.AppendSwitch(installer::switches::kVerboseLogging);
+  AppCommand app_cmd(cmd_line.GetCommandLineString());
+  commands_.Set(installer::kQueryEULAAccepetance, app_cmd);
+}
+
 }  // 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 164 matching lines @@
     channels = &kChromeFrameChannels[0];  // SxS GCF has its own channel names.
   const int channel_modifiers =
       is_multi_install ? GetChannelModifiers(inst_type) : 0;
 
   state->Clear();
   state->SetChannel(channels[channel], channel_modifiers);
   state->SetVersion(chrome::kChromeVersion);
   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) {
+    if (inst_type == InstallationValidator::CHROME_MULTI ||
+         inst_type ==
+             InstallationValidator::CHROME_FRAME_READY_MODE_CHROME_MULTI)) {
+      state->AddQuickEnableCfCommand(prod_type, install_level,
+                                     chrome::kChromeVersion, channel_modifiers);
+    }
+    state->AddQueryEULAAcceptanceCommand(prod_type,
+                                         install_level,
+                                         chrome::kChromeVersion,
+                                         channel_modifiers);
   }
   if (prod_type == BrowserDistribution::CHROME_BINARIES) {
     state->AddQuickEnableApplicationHostCommand(prod_type,
                                                 install_level,
                                                 chrome::kChromeVersion,
                                                 channel_modifiers);
   }
   if (prod_type == BrowserDistribution::CHROME_BROWSER) {
     state->AddOsUpgradeCommand(prod_type,
                                install_level,
@@ skipping 74 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));