Fix multi-install update regression.

chrome/installer/util/util_constants.h

 // 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.
 //
 // Defines all install related constants that need to be used by Chrome as
 // well as Chrome Installer.
 
 #ifndef CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H_
 #define CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H_
 
@@ skipping 52 matching lines @@
                               // multi-install installation of the same product
                               // on the system.
   READY_MODE_OPT_IN_FAILED,   // 36. Failed to opt-into Chrome Frame.
   READY_MODE_TEMP_OPT_OUT_FAILED,   // 37. Failed to temporarily opt-out of
                                     // Chrome Frame.
   READY_MODE_END_TEMP_OPT_OUT_FAILED,   // 38. Failed to end temporary opt-out
                                         // of Chrome Frame.
   CONFLICTING_CHANNEL_EXISTS,  // 39. A multi-install product on a different
                                // update channel exists.
   READY_MODE_REQUIRES_CHROME,  // 40. Chrome Frame in ready-mode requires Chrome
-  REQUIRES_MULTI_INSTALL,      // 41. --multi-install was missing from the

[grt (UTC plus 2), 2012/07/24 15:02:03]

this value was never used (really), so i'm repurposing it here.

+  APP_HOST_REQUIRES_MULTI_INSTALL,  // 41. --multi-install was missing from the
                                // command line.
   APPLY_DIFF_PATCH_FAILED,     // 42. Failed to apply a diff patch.
   INCONSISTENT_UPDATE_POLICY,  // 43. Inconsistent update policy GP settings.
+  APP_HOST_REQUIRES_USER_LEVEL,  // 44. --system-level is forbidden.
+  APP_HOST_REQUIRES_BINARIES,  // 45. No Chrome binaries at either level.
 };
 
 
 // If the following compile assert fires it means that the InstallStatus
 // enumeration changed which will break the contract between the old
 // chrome installed and the new setup.exe that is trying to upgrade.
 COMPILE_ASSERT(installer::INCONSISTENT_UPDATE_POLICY == 43,

[gab, 2012/07/24 16:57:10]

Change this to COMPILE_ASSERT(installer::APP_HOST_REQUIRES_BINARIES == 45, ...);

I also feel the comment on this assert is unclear (i.e. what's the "contract"
between the 2 setups?)... I feel it's more:
"The order of the enum above cannot change. All new statuses should be added at
the end."

[grt (UTC plus 2), 2012/07/24 20:31:29]

Nice catch, thanks.
Good point.  Let me know what you think of my change.

[gab, 2012/07/24 20:34:49]

lgtm

                dont_change_enum);
 
 // The type of an update archive.
 enum ArchiveType {
   UNKNOWN_ARCHIVE_TYPE,     // Unknown or uninitialized.
   FULL_ARCHIVE_TYPE,        // Full chrome.7z archive.
   INCREMENTAL_ARCHIVE_TYPE  // Incremental or differential archive.
 };
 
 // Stages of an installation reported through Google Update on failure.
@@ skipping 125 matching lines @@
 extern const wchar_t kChromeChannelCanary[];
 extern const wchar_t kChromeChannelDev[];
 extern const wchar_t kChromeChannelBeta[];
 extern const wchar_t kChromeChannelStable[];
 
 extern const size_t kMaxAppModelIdLength;
 
 }  // namespace installer
 
 #endif  // CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H_