Reverting this as it caused installer_unit_tests to fail. Please fix and rela...

chrome/installer/util/google_chrome_distribution.h

 // Copyright (c) 2006-2009 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.
 //
 // This file extends generic BrowserDistribution class to declare Google Chrome
 // specific implementation.
 
 #ifndef CHROME_INSTALLER_UTIL_GOOGLE_CHROME_DISTRIBUTION_H_
 #define CHROME_INSTALLER_UTIL_GOOGLE_CHROME_DISTRIBUTION_H_
 
@@ skipping 20 matching lines @@
                                          const std::wstring& distribution_data);
 
   virtual std::wstring GetAppGuid();
 
   virtual std::wstring GetApplicationName();
 
   virtual std::wstring GetAlternateApplicationName();
 
   virtual std::wstring GetInstallSubDir();
 
+  // 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_status: if 0, means installation was successful.
+  // value: current value of Google Update "ap" key.
+  std::wstring GetNewGoogleUpdateApKey(bool diff_install,
+      installer_util::InstallStatus status, const std::wstring& value);
+
   virtual std::wstring GetPublisherName();
 
   virtual std::wstring GetAppDescription();
 
   virtual std::string GetSafeBrowsingName();
 
   virtual std::wstring GetStateKey();
 
   virtual std::wstring GetStateMediumKey();
 
@@ skipping 54 matching lines @@
   // Returns true if at least one uninstall metric was found in
   // uninstall_metrics_dict, false otherwise.
   virtual bool BuildUninstallMetricsString(
       DictionaryValue* uninstall_metrics_dict, std::wstring* metrics);
 
   // The product ID for Google Update.
   std::wstring product_guid_;
 };
 
 #endif  // CHROME_INSTALLER_UTIL_GOOGLE_CHROME_DISTRIBUTION_H_