Ensuring Google Update at user-level is installed alongside App Host, for the quick-enable App Host…

chrome/installer/setup/setup_main.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 <windows.h>
 #include <msi.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
 #include "base/at_exit.h"
@@ skipping 21 matching lines @@
 #include "chrome/installer/setup/install_worker.h"
 #include "chrome/installer/setup/setup_constants.h"
 #include "chrome/installer/setup/setup_util.h"
 #include "chrome/installer/setup/uninstall.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/channel_info.h"
 #include "chrome/installer/util/delete_after_reboot_helper.h"
 #include "chrome/installer/util/delete_tree_work_item.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/google_update_settings.h"
+#include "chrome/installer/util/google_update_util.h"
 #include "chrome/installer/util/helper.h"
 #include "chrome/installer/util/html_dialog.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/installation_state.h"
 #include "chrome/installer/util/installation_validator.h"
 #include "chrome/installer/util/installer_state.h"
 #include "chrome/installer/util/l10n_string_util.h"
 #include "chrome/installer/util/logging_installer.h"
 #include "chrome/installer/util/lzma_util.h"
 #include "chrome/installer/util/master_preferences.h"
@@ skipping 675 matching lines @@
         switch (higher_products) {
           case kBrowserBit:
             message_id = IDS_INSTALL_HIGHER_VERSION_BASE;
             break;
           case kGCFBit:
             message_id = IDS_INSTALL_HIGHER_VERSION_CF_BASE;
             break;
           case kGCFBit | kBrowserBit:
             message_id = IDS_INSTALL_HIGHER_VERSION_CB_CF_BASE;
             break;
+          case kAppHostBit:
+            message_id = IDS_INSTALL_HIGHER_VERSION_APP_HOST_BASE;
+            break;
           default:
+            // TODO: Get a more appropriate message for other subsets.

[grt (UTC plus 2), 2012/09/20 17:58:51]

TODO(who?)

             message_id = IDS_INSTALL_HIGHER_VERSION_APP_HOST_BASE;

[erikwright (departed), 2012/09/20 18:00:01]

I think that this message is actually generic (doesn't reference the App Host in
the string).

If so, just change the ID to not reference the app host. It doesn't make sense
to get into every single possible permutation of this stuff.

[huangs, 2012/09/21 01:43:14]

Reverting and no-op, per discussion.

             break;
         }
 
         installer_state.WriteInstallerResult(install_status, message_id, NULL);
       }
 
       proceed_with_installation =
           proceed_with_installation &&
           CheckGroupPolicySettings(original_state, installer_state,
                                    *installer_version, &install_status);
@@ skipping 95 matching lines @@
       }
       for (Products::const_iterator it = products.begin(); it < products.end();
            ++it) {
         const Product& product = **it;
         product.distribution()->LaunchUserExperiment(setup_path,
             install_status, *installer_version, product, system_install);
       }
     }
   }
 
+  // Install Google Update, if it is not installed already.

[grt (UTC plus 2), 2012/09/20 17:58:51]

no comma

[huangs, 2012/09/21 01:43:14]

Done.

+  // This is for quick-enable App Host install via system-level Google Update.

[erikwright (departed), 2012/09/20 18:00:01]

via ... -> from a system-level Chrome Binaries installation.

[huangs, 2012/09/21 01:43:14]

Done.

+  if (cmd_line.HasSwitch(installer::switches::kEnsureGoogleUpdateInstalled)) {
+    // Currently this feature is only needed by, and implemented for user-level.

[erikwright (departed), 2012/09/20 18:00:01]

Remove this comment and edit line 859 to say something like:

"Install Google Update at user-level (if not present) using the installer from
an existing system-level installation."

[huangs, 2012/09/21 01:43:14]

Done, merged with earlier comment, too.

+    if (!system_install) {
+      if (!google_update::EnsureUserLevelGoogleUpdateInstalled()) {

[grt (UTC plus 2), 2012/09/20 17:58:51]

no braces

[huangs, 2012/09/21 01:43:14]

Done.

+        LOG(ERROR) << "Failed to install Google Update";
+      }
+    } else {
+      LOG(ERROR) << "--" << installer::switches::kEnsureGoogleUpdateInstalled

[grt (UTC plus 2), 2012/09/20 17:58:51]

this belongs in CheckAppHostPreconditions, no?

[huangs, 2012/09/21 01:43:14]

Talked to erikwright@: Moving the check for user-level to
CheckAppHostPreconditions(), but keeping the install here.

+                 << " is for user level only";
+    }
+  }
+
   // Delete the master profile file if present. Note that we do not care about
   // rollback here and we schedule for deletion on reboot if the delete fails.
   // As such, we do not use DeleteTreeWorkItem.
   if (cmd_line.HasSwitch(installer::switches::kInstallerData)) {
     FilePath prefs_path(cmd_line.GetSwitchValuePath(
         installer::switches::kInstallerData));
     if (!file_util::Delete(prefs_path, true)) {
       LOG(ERROR) << "Failed deleting master preferences file "
                  << prefs_path.value()
                  << ", scheduling for deletion after reboot.";
@@ skipping 223 matching lines @@
   } else if (cmd_line.HasSwitch(installer::switches::kShowEula)) {
     // Check if we need to show the EULA. If it is passed as a command line
     // then the dialog is shown and regardless of the outcome setup exits here.
     string16 inner_frame =
         cmd_line.GetSwitchValueNative(installer::switches::kShowEula);
     *exit_code = ShowEULADialog(inner_frame);
     if (installer::EULA_REJECTED != *exit_code) {
       GoogleUpdateSettings::SetEULAConsent(
           original_state, BrowserDistribution::GetDistribution(), true);
     }
-  } else if (cmd_line.HasSwitch(
-      installer::switches::kConfigureUserSettings)) {
+  } else if (cmd_line.HasSwitch(installer::switches::kConfigureUserSettings)) {
     DCHECK(installer_state->system_install());
     const Product* chrome_install =
         installer_state->FindProduct(BrowserDistribution::CHROME_BROWSER);
     DCHECK(chrome_install);
     // TODO(gab): Implement the new shortcut functionality here.
     LOG(ERROR) << "--configure-user-settings is not implemented.";
-  } else if (cmd_line.HasSwitch(
-      installer::switches::kRegisterChromeBrowser)) {
+  } else if (cmd_line.HasSwitch(installer::switches::kRegisterChromeBrowser)) {
     installer::InstallStatus status = installer::UNKNOWN_STATUS;
     const Product* chrome_install =
         installer_state->FindProduct(BrowserDistribution::CHROME_BROWSER);
     if (chrome_install) {
       // If --register-chrome-browser option is specified, register all
       // Chrome protocol/file associations, as well as register it as a valid
       // browser for Start Menu->Internet shortcut. This switch will also
       // register Chrome as a valid handler for a set of URL protocols that
       // Chrome may become the default handler for, either by the user marking
       // Chrome as the default browser, through the Windows Default Programs
       // control panel settings, or through website use of
       // registerProtocolHandler. These protocols are found in
       // ShellUtil::kPotentialProtocolAssociations.
       // The --register-url-protocol will additionally register Chrome as a
       // potential handler for the supplied protocol, and is used if a website
       // registers a handler for a protocol not found in
       // ShellUtil::kPotentialProtocolAssociations.
       // These options should only be used when setup.exe is launched with admin
       // rights. We do not make any user specific changes with this option.
       DCHECK(IsUserAnAdmin());
       string16 chrome_exe(cmd_line.GetSwitchValueNative(
           installer::switches::kRegisterChromeBrowser));
       string16 suffix;
       if (cmd_line.HasSwitch(
           installer::switches::kRegisterChromeBrowserSuffix)) {
         suffix = cmd_line.GetSwitchValueNative(
             installer::switches::kRegisterChromeBrowserSuffix);
       }
-      if (cmd_line.HasSwitch(
-          installer::switches::kRegisterURLProtocol)) {
+      if (cmd_line.HasSwitch(installer::switches::kRegisterURLProtocol)) {
         string16 protocol = cmd_line.GetSwitchValueNative(
             installer::switches::kRegisterURLProtocol);
         // ShellUtil::RegisterChromeForProtocol performs all registration
         // done by ShellUtil::RegisterChromeBrowser, as well as registering
         // with Windows as capable of handling the supplied protocol.
         if (ShellUtil::RegisterChromeForProtocol(
                 chrome_install->distribution(), chrome_exe, suffix, protocol,
                 false))
           status = installer::IN_USE_UPDATED;
       } else {
@@ skipping 372 matching lines @@
   if (!(installer_state.is_msi() && is_uninstall))
     // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT
     // to pass through, since this is only returned on uninstall which is
     // never invoked directly by Google Update.
     return_code = InstallUtil::GetInstallReturnCode(install_status);
 
   VLOG(1) << "Installation complete, returning: " << return_code;
 
   return return_code;
 }