summaryrefslogtreecommitdiffstats
path: root/chrome/installer/gcapi
diff options
context:
space:
mode:
authortommycli@chromium.org <tommycli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-12 01:47:03 +0000
committertommycli@chromium.org <tommycli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-12 01:47:03 +0000
commiteb378370695559622eb0c4f9a127db1b95b1d35e (patch)
treed536333492c10be88ba07bdcdd155a8f5debde7a /chrome/installer/gcapi
parent92908dfef88fdc072224e3ad52bdefa83208857d (diff)
downloadchromium_src-eb378370695559622eb0c4f9a127db1b95b1d35e.zip
chromium_src-eb378370695559622eb0c4f9a127db1b95b1d35e.tar.gz
chromium_src-eb378370695559622eb0c4f9a127db1b95b1d35e.tar.bz2
Base: Make RegistryOverrideManager support sharded/parallel tests.
BUG=314800 TBR=ajwong@chromium.org Review URL: https://codereview.chromium.org/57423008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234367 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/gcapi')
-rw-r--r--chrome/installer/gcapi/gcapi_test_registry_overrider.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/chrome/installer/gcapi/gcapi_test_registry_overrider.cc b/chrome/installer/gcapi/gcapi_test_registry_overrider.cc
index 2df337f..be678a2 100644
--- a/chrome/installer/gcapi/gcapi_test_registry_overrider.cc
+++ b/chrome/installer/gcapi/gcapi_test_registry_overrider.cc
@@ -11,12 +11,8 @@
GCAPITestRegistryOverrider::GCAPITestRegistryOverrider() {
// Override keys - this is undone during destruction.
- string16 hkcu_override = base::StringPrintf(
- L"hkcu_override\\%ls", ASCIIToWide(base::GenerateGUID()));
- override_manager_.OverrideRegistry(HKEY_CURRENT_USER, hkcu_override);
- string16 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");
}
GCAPITestRegistryOverrider::~GCAPITestRegistryOverrider() {