Handle upgrade case from previous MSI install.

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 "chrome/installer/setup/setup_main.h"
 
 #include <windows.h>
 #include <msi.h>
 #include <shellapi.h>
 #include <shlobj.h>
@@ skipping 1636 matching lines @@
     for (Products::const_iterator it = products.begin(); it < products.end();
          ++it) {
       const Product& product = **it;
       product.LaunchUserExperiment(setup_path, install_status, system_install);
     }
   }
 
   // If the installation completed successfully...
   if (InstallUtil::GetInstallReturnCode(install_status) == 0) {
     // Update the DisplayVersion created by an MSI-based install.
+    base::FilePath master_preferences_file(
+      installer_state.target_path().AppendASCII(
+          installer::kDefaultMasterPrefs));
     std::string install_id;
     if (prefs.GetString(installer::master_preferences::kMsiProductId,
                         &install_id)) {
+      // A currently active MSI install will have specified the master-
+      // preferences file on the command-line that includes the product-id.
+      // We must delay the setting of the DisplayVersion until after the
+      // grandparent "msiexec" process has exited.
       base::FilePath new_setup =
           installer_state.GetInstallerDirectory(*installer_version)
           .Append(kSetupExe);
       DelayedOverwriteDisplayVersions(
           new_setup, install_id, *installer_version);
+    } else {
+      // Only when called by the MSI installer do we need to delay setting
+      // the DisplayVersion.  In other runs, such as those done by the auto-
+      // update action, we set the value immediately.
+      const Product* chrome = installer_state.FindProduct(
+          BrowserDistribution::CHROME_BROWSER);
+      if (chrome != NULL) {
+        // Get the app's GUID and remove surrounding braces.
+        base::string16 app_guid = chrome->distribution()

[grt (UTC plus 2), 2015/10/02 17:55:47]

Chrome's appguid for registration with Google Update isn't the same as the MSI
product id. The product ID needs to be pulled from the registry à la
ExtractMSIProductId in
https://codereview.chromium.org/749133003/diff/80001/chrome/installer/setup/i...

[bcwhite, 2015/10/02 17:58:20]

That's odd.  I checked the value and it matched what I was expecting.  I checked
the registry on an install and couldn't find the data/value that code was
searching for.

I'll check again.

[grt (UTC plus 2), 2015/10/02 18:05:19]

GetAppGuid() will always return {8A69D345-D564-463c-AFF1-A69D9E530F96} for
Chrome. The MSI product ID is dynamic, changing for every build. Chrome's
ClientState key will have a value named something like
"EnterpriseProduct0FA69F39-D0BF-3023-BAD8-9AA90EA79ED3" where the stuff after
"EnterpriseProduct" (IIRC) is the product ID at the time of install.

+            ->GetAppGuid().substr(1, 36);
+        OverwriteDisplayVersions(app_guid,
+                                 base::UTF8ToUTF16(
+                                     installer_version->GetString()));
+      }
     }
     // Return the path to the directory containing the newly installed
     // setup.exe and uncompressed archive if the caller requested it.
     if (installer_directory) {
       *installer_directory =
           installer_state.GetInstallerDirectory(*installer_version);
     }
   }
 
   // temp_path's dtor will take care of deleting or scheduling itself for
@@ skipping 151 matching lines @@
     // 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;
 }