Fix problem whereby the "-full" magic value is removed from the "ap" value wh...

chrome/installer/util/google_update_settings.h

 // Copyright (c) 2006-2008 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.
 
 #ifndef CHROME_INSTALLER_UTIL_GOOGLE_UPDATE_SETTINGS_H_
 #define CHROME_INSTALLER_UTIL_GOOGLE_UPDATE_SETTINGS_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 65 matching lines @@
 
   // Overwrites the current value of the referral with an empty string. Returns
   // true if this operation succeeded.
   static bool ClearReferral();
 
   // Return a human readable modifier for the version string, e.g.
   // the channel (dev, beta, stable). Returns true if this operation succeeded,
   // on success, channel contains one of "", "unknown", "dev" or "beta".
   static bool GetChromeChannel(bool system_install, std::wstring* channel);
 
+  static void UpdateDiffInstallStatus(bool system_install,
+                                      bool incremental_install,
+                                      int install_return_code,
+                                      const std::wstring& product_guid);
+
+  // This method generates the new value for Google Update "ap" key for Chrome
+  // based on whether we are doing incremental install (or not) and whether
+  // the install succeeded.
+  // - If install worked, remove the magic string (if present).
+  // - If incremental installer failed, append a magic string (if
+  //   not present already).
+  // - If full installer failed, still remove this magic
+  //   string (if it is present already).
+  //
+  // diff_install: tells whether this is incremental install or not.
+  // install_return_code: if 0, means installation was successful.
+  // value: current value of Google Update "ap" key.
+  static std::wstring GetNewGoogleUpdateApKey(bool diff_install,
+                                              int install_return_code,
+                                              const std::wstring& value);
+
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(GoogleUpdateSettings);
 };
 
 #endif  // CHROME_INSTALLER_UTIL_GOOGLE_UPDATE_SETTINGS_H_