GCAPI should append to the existing experiment_labels instead of clobbering them.

chrome/installer/gcapi/gcapi_reactivation_test.cc

Index: chrome/installer/gcapi/gcapi_reactivation_test.cc
diff --git a/chrome/installer/gcapi/gcapi_reactivation_test.cc b/chrome/installer/gcapi/gcapi_reactivation_test.cc
index 92987a202791b2b2d9f762476420ac6bd5049c95..fb154e6a689ca8dd47c33cbd97989ea0f8261f0e 100644
--- a/chrome/installer/gcapi/gcapi_reactivation_test.cc
+++ b/chrome/installer/gcapi/gcapi_reactivation_test.cc
@@ -5,16 +5,13 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/guid.h"
 #include "base/strings/string_number_conversions.h"
-#include "base/strings/stringprintf.h"
-#include "base/strings/utf_string_conversions.h"
-#include "base/test/test_reg_util_win.h"
 #include "base/time/time.h"
 #include "base/win/registry.h"
 #include "chrome/installer/gcapi/gcapi.h"
 #include "chrome/installer/gcapi/gcapi_omaha_experiment.h"
 #include "chrome/installer/gcapi/gcapi_reactivation.h"
+#include "chrome/installer/gcapi/gcapi_test_registry_overrider.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -24,15 +21,7 @@ using base::win::RegKey;
 
 class GCAPIReactivationTest : public ::testing::Test {
  protected:
-  void SetUp() {
-    // Override keys - this is undone during destruction.
-    std::wstring hkcu_override = base::StringPrintf(
-        L"hkcu_override\\%ls", ASCIIToWide(base::GenerateGUID()));
-    override_manager_.OverrideRegistry(HKEY_CURRENT_USER, hkcu_override);
-    std::wstring hklm_override = base::StringPrintf(
-        L"hklm_override\\%ls", ASCIIToWide(base::GenerateGUID()));
-    override_manager_.OverrideRegistry(HKEY_LOCAL_MACHINE, hklm_override);
-  }
+  GCAPIReactivationTest() {}

[Alexei Svitkine (slow), 2013/11/05 23:05:23]

Nit you can omit this, since this is entirely in the cc file.

[gab, 2013/11/06 16:39:10]

I added this as not putting it results in this compile error:

FAILED: ninja -t msvc -e environment.x86 -- "c:\Program Files (x86)\Microsoft
Visual Studio 10.0\VC\bin\cl.exe" /nologo /showIncludes /FC
@obj\chrome\installer\gcapi\gcapi_test.gcapi_reactivation_test.obj.rsp /c
..\..\chrome\installer\gcapi\gcapi_reactivation_test.cc
/Foobj\chrome\installer\gcapi\gcapi_test.gcapi_reactivation_test.obj
/Fdobj\chrome\gcapi_test.pdb 
d:\src\debug\src\chrome\installer\gcapi\gcapi_reactivation_test.cc(94) : error
C2512: 'GCAPIReactivationTest' : no appropriate default constructor available
d:\src\debug\src\chrome\installer\gcapi\gcapi_reactivation_test.cc(101) : error
C2512: 'GCAPIReactivationTest' : no appropriate default constructor available
d:\src\debug\src\chrome\installer\gcapi\gcapi_reactivation_test.cc(154) : error
C2512: 'GCAPIReactivationTest' : no appropriate default constructor available
d:\src\debug\src\chrome\installer\gcapi\gcapi_reactivation_test.cc(190) : error
C2512: 'GCAPIReactivationTest' : no appropriate default constructor available

I don't really understand why... it's related to adding a new field which has to
be implicitly destroyed, but I'm not sure why adding a default constructor
helps... I did that because this one failed to compile where as
GCAPIOmahaExperimentTest compiled and the presence of a constructor was the only
obvious difference between the two...

[Alexei Svitkine (slow), 2013/11/06 22:45:06]

Weird, okay.

 
   bool SetChromeInstallMarker(HKEY hive) {
     // Create the client state keys in the right places.
@@ -100,8 +89,7 @@ class GCAPIReactivationTest : public ::testing::Test {
     return L"ERROR";
   }
 
- private:
-  registry_util::RegistryOverrideManager override_manager_;
+  const GCAPITestRegistryOverrider gcapi_test_registry_overrider_;
 };
 
 TEST_F(GCAPIReactivationTest, CheckSetReactivationBrandCode) {
@@ -109,7 +97,6 @@ TEST_F(GCAPIReactivationTest, CheckSetReactivationBrandCode) {
   EXPECT_EQ(L"GAGA", GetReactivationString(HKEY_CURRENT_USER));
 
   EXPECT_TRUE(HasBeenReactivated());
-
 }
 
 TEST_F(GCAPIReactivationTest, CanOfferReactivation_Basic) {