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

chrome/installer/util/chrome_frame_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 a specific implementation of BrowserDistribution class for
 // Chrome Frame. It overrides the bare minimum of methods necessary to get a
 // Chrome Frame installer that does not interact with Google Chrome or
 // Chromium installations.
 
 #include "chrome/installer/util/chrome_frame_distribution.h"
 
 #include <string>
 #include <windows.h>
 
 #include "base/logging.h"
 #include "base/registry.h"
 #include "base/string_util.h"
 #include "chrome/installer/util/l10n_string_util.h"
 #include "chrome/installer/util/google_update_constants.h"
+#include "chrome/installer/util/google_update_settings.h"
 
 #include "installer_util_strings.h"
 
 namespace {
 const wchar_t kChromeFrameGuid[] = L"{8BA986DA-5100-405E-AA35-86F34A02ACBF}";
 }
 
 std::wstring ChromeFrameDistribution::GetAppGuid() {
   return kChromeFrameGuid;
 }
@@ skipping 70 matching lines @@
 std::wstring ChromeFrameDistribution::GetEnvVersionKey() {
   return L"CHROME_FRAME_VERSION";
 }
 
 bool ChromeFrameDistribution::CanSetAsDefault() {
   return false;
 }
 
 void ChromeFrameDistribution::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(kChromeFrameGuid);
-  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.";
-  } else {
-    const char kMagicSuffix[] = "-full";
-    if (LowerCaseEqualsASCII(ap_key_value, kMagicSuffix)) {
-      key.DeleteValue(google_update::kRegApField);
-    } else {
-      size_t pos = ap_key_value.find(ASCIIToWide(kMagicSuffix));
-      if (pos != std::wstring::npos) {
-        ap_key_value.erase(pos, strlen(kMagicSuffix));
-        key.WriteValue(google_update::kRegApField, ap_key_value.c_str());
-      }
-    }
-  }
+  GoogleUpdateSettings::UpdateDiffInstallStatus(system_install,
+      incremental_install, GetInstallReturnCode(install_status),
+      kChromeFrameGuid);
 }