Base: Make RegistryOverrideManager support sharded/parallel tests.

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..0679f3f8cbc6a9920ff9fe549b390ba69cb0ceca 100644
--- a/chrome/installer/gcapi/gcapi_reactivation_test.cc
+++ b/chrome/installer/gcapi/gcapi_reactivation_test.cc
@@ -26,12 +26,8 @@ class GCAPIReactivationTest : public ::testing::Test {
  protected:
   void SetUp() {

[grt (UTC plus 2), 2013/11/07 02:39:33]

while you're here:
  virtual void SetUp() OVERRIDE {

[tommycli, 2013/11/07 18:02:07]

Done.

     // 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);
+    override_manager_.OverrideRegistry(HKEY_CURRENT_USER, L"hkcu_override");
+    override_manager_.OverrideRegistry(HKEY_LOCAL_MACHINE, L"hklm_override");
   }
 
   bool SetChromeInstallMarker(HKEY hive) {