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

chrome/installer/gcapi/gcapi_reactivation_test.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 <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"
 
 using base::Time;
 using base::TimeDelta;
 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() {}
 
   bool SetChromeInstallMarker(HKEY hive) {
     // Create the client state keys in the right places.
     std::wstring reg_path(google_update::kRegPathClients);
     reg_path += L"\\";
     reg_path += google_update::kChromeUpgradeCode;
     RegKey client_state(hive,
                         reg_path.c_str(),
                         KEY_CREATE_SUB_KEY | KEY_SET_VALUE);
     return (client_state.Valid() &&
@@ skipping 47 matching lines @@
       std::wstring actual_brand;
       if (client_state.ReadValue(google_update::kRegRLZReactivationBrandField,
                                  &actual_brand) == ERROR_SUCCESS) {
         return actual_brand;
       }
     }
 
     return L"ERROR";
   }
 
- private:
-  registry_util::RegistryOverrideManager override_manager_;
+  const GCAPITestRegistryOverrider gcapi_test_registry_overrider_;
 };
 
 TEST_F(GCAPIReactivationTest, CheckSetReactivationBrandCode) {
   EXPECT_TRUE(SetReactivationBrandCode(L"GAGA", GCAPI_INVOKED_STANDARD_SHELL));
   EXPECT_EQ(L"GAGA", GetReactivationString(HKEY_CURRENT_USER));
 
   EXPECT_TRUE(HasBeenReactivated());
-
 }
 
 TEST_F(GCAPIReactivationTest, CanOfferReactivation_Basic) {
   DWORD error;
 
   // We're not installed yet. Make sure CanOfferReactivation fails.
   EXPECT_FALSE(CanOfferReactivation(L"GAGA",
                                     GCAPI_INVOKED_STANDARD_SHELL,
                                     &error));
   EXPECT_EQ(REACTIVATE_ERROR_NOTINSTALLED, error);
@@ skipping 89 matching lines @@
   EXPECT_TRUE(SetLastRunTime(HKEY_CURRENT_USER,
                              hkcu_last_run.ToInternalValue()));
 
   EXPECT_TRUE(ReactivateChrome(L"GAGA",
                                GCAPI_INVOKED_STANDARD_SHELL,
                                &error));
   EXPECT_EQ(L"GAGA", GetReactivationString(HKEY_CURRENT_USER));
 
   EXPECT_TRUE(HasExperimentLabels(HKEY_CURRENT_USER));
 }