This patch modifies some aspects of GCAPI in support of the new Chrome reactivation functions.

chrome/installer/gcapi/gcapi_reactivation.cc

 // 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.
 
 #include "chrome/installer/gcapi/gcapi_reactivation.h"
 
 #include "base/time.h"
 #include "base/win/registry.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/gcapi/gcapi.h"
 
 using base::Time;
 using base::win::RegKey;
 
 namespace {
 const wchar_t kReactivationHistoryKey[] = L"reactivation";
 
 std::wstring GetReactivationHistoryKeyPath() {
   std::wstring reactivation_path(google_update::kRegPathClientState);
   reactivation_path += L"\\";
   reactivation_path += google_update::kChromeUpgradeCode;
   reactivation_path += L"\\";
   reactivation_path += kReactivationHistoryKey;
   return reactivation_path;
 }
 }  // namespace
 
-bool HasBeenReactivatedByBrandCodes(
-    const std::vector<std::wstring>& brand_codes) {
+bool HasBeenReactivated() {
   bool success = false;

[robertshield, 2012/03/23 17:52:16]

delete this line

[mgraboski, 2012/03/23 21:40:35]

Done.

 
   RegKey reactivation_key(HKEY_CURRENT_USER,
                           GetReactivationHistoryKeyPath().c_str(),
                           KEY_QUERY_VALUE);
   if (reactivation_key.Valid()) {
-    std::vector<std::wstring>::const_iterator brand_iter(brand_codes.begin());
-    for (; brand_iter != brand_codes.end(); ++brand_iter) {
-      if (reactivation_key.HasValue(brand_iter->c_str())) {
-        success = true;
-        break;
-      }
-    }
+    success = true;
   }
 
   return success;

[robertshield, 2012/03/23 17:52:16]

change the above four lines to:
return reactivation_key.Valid();

[mgraboski, 2012/03/23 21:40:35]

Done.

 }
 
 bool SetReactivationBrandCode(const std::wstring& brand_code, int shell_mode) {
   bool success = false;
 
   // This function currently only should be run in a non-elevated shell,
   // so we return "true" if it is being invoked from an elevated shell.
   if (shell_mode == GCAPI_INVOKED_UAC_ELEVATION)
     return true;
 
@@ skipping 17 matching lines @@
     if (reactivation_key.Valid()) {
       int64 timestamp = Time::Now().ToInternalValue();
       reactivation_key.WriteValue(brand_code.c_str(),
                                   &timestamp,
                                   sizeof(timestamp),
                                   REG_QWORD);
     }
   }
 
   return success;
-}
+}
+