diff options
| author | tommycli@chromium.org <tommycli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-15 04:48:37 +0000 |
|---|---|---|
| committer | tommycli@chromium.org <tommycli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-15 04:48:37 +0000 |
| commit | 19b5cc2c2e3e9d41f9f25e50b0fef27a9f60a688 (patch) | |
| tree | 1aa9b7d439402ea355b6c179c59354f1d0afaa3d /chrome/installer/gcapi | |
| parent | f35f888a9f50ba6282ad9ae6ee303765fd2826f4 (diff) | |
| download | chromium_src-19b5cc2c2e3e9d41f9f25e50b0fef27a9f60a688.zip chromium_src-19b5cc2c2e3e9d41f9f25e50b0fef27a9f60a688.tar.gz chromium_src-19b5cc2c2e3e9d41f9f25e50b0fef27a9f60a688.tar.bz2 | |
Revert "Revert 234367 "Base: Make RegistryOverrideManager support sharde...""
This reverts commit 98ee7dd64463c42a076782c923330107e60b8fad.
Reapply of https://codereview.chromium.org/57423008 now that a blocking issue has been fixed.
BUG=314800
TBR=grt,owners
Review URL: https://codereview.chromium.org/68743005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235284 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/gcapi')
| -rw-r--r-- | chrome/installer/gcapi/gcapi_test_registry_overrider.cc | 8 |
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() { |