Revert 207805 "Differential updates for components. We are addin..."

trunk/src/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 62 matching lines @@
   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.
   INSTALL_OF_GOOGLE_UPDATE_FAILED,  // 46. Failed to install Google Update.
   INVALID_STATE_FOR_OPTION,    // 47. A non-install option was called with an
                                // invalid installer state.
   WAIT_FOR_EXISTING_FAILED,    // 48. OS error waiting for existing setup.exe.
-  PATCH_INVALID_ARGUMENTS,     // 49. The arguments of --patch were missing or
-                               // they were invalid for any reason.
   // Friendly reminder: note the COMPILE_ASSERT below.
 };
 
 
 // Existing InstallStatus values must not change.  Always add to the end.
-COMPILE_ASSERT(installer::PATCH_INVALID_ARGUMENTS == 49,
+COMPILE_ASSERT(installer::WAIT_FOR_EXISTING_FAILED == 48,
                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 22 matching lines @@
   DEFERRING_TO_HIGHER_VERSION,  // 18: Deferring to an installed higher version.
   NUM_STAGES                   // 19: The number of stages.
 };
 
 // When we start reporting the numerical values from the enum, the order
 // above MUST be preserved.
 COMPILE_ASSERT(DEFERRING_TO_HIGHER_VERSION == 18,
                never_ever_ever_change_InstallerStage_values_bang);
 
 namespace switches {
-
 extern const char kAutoLaunchChrome[];
 extern const char kChrome[];
 extern const char kChromeAppHostDeprecated[];  // TODO(huangs): Remove by M27.
 extern const char kChromeAppLauncher[];
 extern const char kChromeFrame[];
 extern const char kChromeFrameQuickEnable[];
 extern const char kChromeFrameReadyMode[];
 extern const char kChromeFrameReadyModeOptIn[];
 extern const char kChromeFrameReadyModeTempOptOut[];
 extern const char kChromeFrameReadyModeEndTempOptOut[];
@@ skipping 29 matching lines @@
 extern const char kSystemLevel[];
 extern const char kUninstall[];
 extern const char kUpdateSetupExe[];
 extern const char kVerboseLogging[];
 extern const char kShowEula[];
 extern const char kShowEulaForMetro[];
 extern const char kInactiveUserToast[];
 extern const char kSystemLevelToast[];
 extern const char kExperimentGroup[];
 extern const char kToastResultsKey[];
-extern const char kPatch[];
-extern const char kInputFile[];
-extern const char kPatchFile[];
-extern const char kOutputFile[];
-
 }  // namespace switches
 
 extern const wchar_t kActiveSetupExe[];
 extern const wchar_t kChromeAppHostExe[];
 extern const wchar_t kChromeDll[];
 extern const wchar_t kChromeExe[];
 extern const wchar_t kChromeFrameDll[];
 extern const wchar_t kChromeFrameHelperExe[];
 extern const wchar_t kChromeFrameHelperWndClass[];
 extern const wchar_t kChromeFrameReadyModeField[];
@@ skipping 40 matching lines @@
 //     installed side-by-side. However, GoogleUpdateSettings::GetChromeChannel
 //     will return "canary" for that product.
 extern const wchar_t kChromeChannelUnknown[];
 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;
 
-// The range of error values for the installer, Courgette, and bsdiff is
-// overlapping. These offset values disambiguate between different sets
-// of errors by shifting the values up with the specified offset.
-const int kCourgetteErrorOffset = 300;
-const int kBsdiffErrorOffset = 600;
-
-// Arguments to --patch switch
-extern const char kCourgette[];
-extern const char kBsdiff[];
-
 }  // namespace installer
 
 #endif  // CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H_