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

chrome/installer/gcapi/gcapi_reactivation.cc

Index: chrome/installer/gcapi/gcapi_reactivation.cc
===================================================================
--- chrome/installer/gcapi/gcapi_reactivation.cc	(revision 125017)
+++ chrome/installer/gcapi/gcapi_reactivation.cc	(working copy)
@@ -25,21 +25,14 @@
 }
 }  // 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.

@@ -80,4 +73,5 @@
   }
 
   return success;
-}
+}
+