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

chrome/installer/gcapi/gcapi_reactivation_test.cc

Index: chrome/installer/gcapi/gcapi_reactivation_test.cc
===================================================================
--- chrome/installer/gcapi/gcapi_reactivation_test.cc	(revision 125017)
+++ chrome/installer/gcapi/gcapi_reactivation_test.cc	(working copy)
@@ -127,13 +127,13 @@
 
   std::vector<std::wstring> check_codes;

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

you can delete check_codes and just have a single 
EXPECT_TRUE(HasBeenReactivated());

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

Done.

   check_codes.push_back(L"GAGA");
-  EXPECT_TRUE(HasBeenReactivatedByBrandCodes(check_codes));
+  EXPECT_TRUE(HasBeenReactivated());
 
   check_codes.push_back(L"GOOGOO");
-  EXPECT_TRUE(HasBeenReactivatedByBrandCodes(check_codes));
+  EXPECT_TRUE(HasBeenReactivated());
 
   check_codes.erase(check_codes.begin());
-  EXPECT_FALSE(HasBeenReactivatedByBrandCodes(check_codes));
+  EXPECT_TRUE(HasBeenReactivated());
 }
 
 TEST_F(GCAPIReactivationTest, CanOfferReactivation_Basic) {
@@ -223,18 +223,18 @@
                                 &error));
   EXPECT_EQ(REACTIVATE_ERROR_ALREADY_REACTIVATED, error);
 
-  // Should still be able to reactivate under other brands:
-  EXPECT_TRUE(ReactivateChrome(L"MAMA", arraysize(previous_brands),
+  // Should not be able to reactivate under other brands:
+  EXPECT_FALSE(ReactivateChrome(L"MAMA", arraysize(previous_brands),
                                previous_brands, GCAPI_INVOKED_STANDARD_SHELL,
                                &error));
-  EXPECT_EQ(L"MAMA", GetReactivationString(HKEY_CURRENT_USER));
+  EXPECT_EQ(L"GAGA", GetReactivationString(HKEY_CURRENT_USER));
 
   // Validate that previous_brands are rejected:
   EXPECT_FALSE(ReactivateChrome(L"PFFT", arraysize(previous_brands),
                                 previous_brands, GCAPI_INVOKED_STANDARD_SHELL,
                                 &error));
   EXPECT_EQ(REACTIVATE_ERROR_ALREADY_REACTIVATED, error);
-  EXPECT_EQ(L"MAMA", GetReactivationString(HKEY_CURRENT_USER));
+  EXPECT_EQ(L"GAGA", GetReactivationString(HKEY_CURRENT_USER));
 }
 
 TEST_F(GCAPIReactivationTest, ExperimentLabelCheck) {