Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / rlz / test / rlz_test_helpers.cc

diff --git a/src/rlz/test/rlz_test_helpers.cc b/src/rlz/test/rlz_test_helpers.cc
index d8b999f..8571bda 100644 (file)
--- a/src/rlz/test/rlz_test_helpers.cc
+++ b/src/rlz/test/rlz_test_helpers.cc
@@ -81,9 +81,8 @@ void WriteRegistryTree(const RegistryKeyData& data, base::win::RegKey* dest) {
   for (std::map<base::string16, RegistryKeyData>::const_iterator iter =
            data.keys.begin();
        iter != data.keys.end(); ++iter) {
-    WriteRegistryTree(iter->second,
-                      &base::win::RegKey(dest->Handle(), iter->first.c_str(),
-                                         KEY_ALL_ACCESS));
+    base::win::RegKey key(dest->Handle(), iter->first.c_str(), KEY_ALL_ACCESS);
+    WriteRegistryTree(iter->second, &key);
   }
 }
 
@@ -116,9 +115,9 @@ void InitializeRegistryOverridesForTesting(
   override_manager->OverrideRegistry(HKEY_CURRENT_USER, L"rlz_temp_hkcu");
 
   if (do_copy) {
-    WriteRegistryTree(data, &base::win::RegKey(HKEY_LOCAL_MACHINE,
-                                               kHKLMAccessProviders,
-                                               KEY_ALL_ACCESS));
+    base::win::RegKey key(
+        HKEY_LOCAL_MACHINE, kHKLMAccessProviders, KEY_ALL_ACCESS);
+    WriteRegistryTree(data, &key);
   }
 }