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

chrome/installer/gcapi/gcapi.h

Index: chrome/installer/gcapi/gcapi.h
===================================================================
--- chrome/installer/gcapi/gcapi.h	(revision 125017)
+++ chrome/installer/gcapi/gcapi.h	(working copy)
@@ -75,48 +75,36 @@
 int __stdcall GoogleChromeDaysSinceLastRun();
 
 // Returns true if a vendor with the specified |brand_code| may offer
-// reactivation at this time. If the vendor has previously used other brand
-// codes, they must pass them in an array of size |previous_brand_codes_length|
-// as |previous_brand_codes|. Returns false if the vendor may not offer
+// reactivation at this time. Returns false if the vendor may not offer
 // reactivation at this time, and places one of the REACTIVATE_ERROR_XXX values
 // in |error_code| if |error_code| is non-null.
 // |shell_mode| should be set to one of GCAPI_INVOKED_STANDARD_SHELL or
 // GCAPI_INVOKED_UAC_ELEVATION depending on whether this method is invoked
 // from an elevated or non-elevated process.
 BOOL __stdcall CanOfferReactivation(const wchar_t* brand_code,
-                                    int previous_brand_codes_length,
-                                    const wchar_t** previous_brand_codes,
                                     int shell_mode,
                                     DWORD* error_code);
 
-// Attempts to reactivate Chrome for the specified |brand_code|. If the vendor
-// has previously used other brand codes, they must pass them in an array of
-// size |previous_brand_codes_length| as |previous_brand_codes|. Returns false
+// Attempts to reactivate Chrome for the specified |brand_code|. Returns false
 // if reactivation fails, and places one of the REACTIVATE_ERROR_XXX values
 // in |error_code| if |error_code| is non-null.
 // |shell_mode| should be set to one of GCAPI_INVOKED_STANDARD_SHELL or
 // GCAPI_INVOKED_UAC_ELEVATION depending on whether this method is invoked
 // from an elevated or non-elevated process.
 BOOL __stdcall ReactivateChrome(wchar_t* brand_code,
-                                int previous_brand_codes_length,
-                                const wchar_t** previous_brand_codes,
                                 int shell_mode,
                                 DWORD* error_code);
 
 // Function pointer type declarations to use with GetProcAddress.
 typedef BOOL (__stdcall *GCCC_CompatibilityCheck)(BOOL, int, DWORD *);
-typedef BOOL (__stdcall *GCCC_LaunchGC)(HANDLE *);
-typedef BOOL (__stdcall *GCCC_LaunchGCWithDimensions)(int, int, int, int);
+typedef BOOL (__stdcall *GCCC_LaunchGC)();
+typedef BOOL (__stdcall *GCCC_LaunchGCWithDimensions)(int, int, int, int, bool);
 typedef int (__stdcall *GCCC_GoogleChromeDaysSinceLastRun)();
 typedef BOOL (__stdcall *GCCC_CanOfferReactivation)(const wchar_t*,
                                                     int,
-                                                    const wchar_t**,
-                                                    int,
                                                     DWORD*);
 typedef BOOL (__stdcall *GCCC_ReactivateChrome)(const wchar_t*,
                                                 int,
-                                                const wchar_t**,
-                                                int,
                                                 DWORD*);
 
 }  // extern "C"