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

chrome/installer/util/google_chrome_distribution.cc

 // Copyright (c) 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 defines specific implementation of BrowserDistribution class for
 // Google Chrome.
 
 #include "chrome/installer/util/google_chrome_distribution.h"
 
 #include <windows.h>
@@ skipping 346 matching lines @@
   return alt_product_name;
 }
 
 std::wstring GoogleChromeDistribution::GetInstallSubDir() {
   std::wstring sub_dir(installer_util::kGoogleChromeInstallSubDir1);
   sub_dir.append(L"\\");
   sub_dir.append(installer_util::kGoogleChromeInstallSubDir2);
   return sub_dir;
 }
 
-std::wstring GoogleChromeDistribution::GetNewGoogleUpdateApKey(
-    bool diff_install, installer_util::InstallStatus status,
-    const std::wstring& value) {
-  // Magic suffix that we need to add or remove to "ap" key value.
-  const std::wstring kMagicSuffix = L"-full";
-
-  bool has_magic_string = false;
-  if ((value.length() >= kMagicSuffix.length()) &&
-      (value.rfind(kMagicSuffix) == (value.length() - kMagicSuffix.length()))) {
-    LOG(INFO) << "Incremental installer failure key already set.";
-    has_magic_string = true;
-  }
-
-  std::wstring new_value(value);
-  if ((!diff_install || !GetInstallReturnCode(status)) && has_magic_string) {
-    LOG(INFO) << "Removing failure key from value " << value;
-    new_value = value.substr(0, value.length() - kMagicSuffix.length());
-  } else if ((diff_install && GetInstallReturnCode(status)) &&
-             !has_magic_string) {
-    LOG(INFO) << "Incremental installer failed, setting failure key.";
-    new_value.append(kMagicSuffix);
-  }
-
-  return new_value;
-}
-
 std::wstring GoogleChromeDistribution::GetPublisherName() {
   const std::wstring& publisher_name =
       installer_util::GetLocalizedString(IDS_ABOUT_VERSION_COMPANY_NAME_BASE);
   return publisher_name;
 }
 
 std::wstring GoogleChromeDistribution::GetAppDescription() {
   const std::wstring& app_description =
       installer_util::GetLocalizedString(IDS_SHORTCUT_TOOLTIP_BASE);
   return app_description;
@@ skipping 83 matching lines @@
 // This method checks if we need to change "ap" key in Google Update to try
 // full installer as fall back method in case incremental installer fails.
 // - If incremental installer fails we append a magic string ("-full"), if
 // it is not present already, so that Google Update server next time will send
 // full installer to update Chrome on the local machine
 // - If we are currently running full installer, we remove this magic
 // string (if it is present) regardless of whether installer failed or not.
 // There is no fall-back for full installer :)
 void GoogleChromeDistribution::UpdateDiffInstallStatus(bool system_install,
     bool incremental_install, installer_util::InstallStatus install_status) {
-  HKEY reg_root = (system_install) ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
-
-  RegKey key;
-  std::wstring ap_key_value;
-  std::wstring reg_key(google_update::kRegPathClientState);
-  reg_key.append(L"\\");
-  reg_key.append(product_guid());
-  if (!key.Open(reg_root, reg_key.c_str(), KEY_ALL_ACCESS) ||
-      !key.ReadValue(google_update::kRegApField, &ap_key_value)) {
-    LOG(INFO) << "Application key not found.";
-    if (!incremental_install || !GetInstallReturnCode(install_status)) {
-      LOG(INFO) << "Returning without changing application key.";
-      key.Close();
-      return;
-    } else if (!key.Valid()) {
-      reg_key.assign(google_update::kRegPathClientState);
-      if (!key.Open(reg_root, reg_key.c_str(), KEY_ALL_ACCESS) ||
-          !key.CreateKey(product_guid().c_str(), KEY_ALL_ACCESS)) {
-        LOG(ERROR) << "Failed to create application key.";
-        key.Close();
-        return;
-      }
-    }
-  }
-
-  std::wstring new_value = GoogleChromeDistribution::GetNewGoogleUpdateApKey(
-      incremental_install, install_status, ap_key_value);
-  if ((new_value.compare(ap_key_value) != 0) &&
-      !key.WriteValue(google_update::kRegApField, new_value.c_str())) {
-    LOG(ERROR) << "Failed to write value " << new_value
-               << " to the registry field " << google_update::kRegApField;
-  }
-  key.Close();
+  GoogleUpdateSettings::UpdateDiffInstallStatus(system_install,
+      incremental_install, GetInstallReturnCode(install_status),
+      product_guid().c_str());
 }
 
 // The functions below are not used by the 64-bit Windows binary -
 // see the comment in google_chrome_distribution_dummy.cc
 #ifndef _WIN64
 // Currently we only have one experiment: the inactive user toast. Which only
 // applies for users doing upgrades.
 //
 // There are three scenarios when this function is called:
 // 1- Is a per-user-install and it updated: perform the experiment
@@ skipping 98 matching lines @@
   GoogleUpdateSettings::SetClient(GetExperimentGroup(outcome, flavor));
   if (outcome != kToastExpUninstallGroup)
     return;
   // The user wants to uninstall. This is a best effort operation. Note that
   // we waited for chrome to exit so the uninstall would not detect chrome
   // running.
   base::LaunchApp(InstallUtil::GetChromeUninstallCmd(system_install),
                   false, false, NULL);
 }
 #endif