rlz: Do not take the address of a temporary.

rlz/test/rlz_test_helpers.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.
 //
 // Main entry point for all unit tests.
 
 #include "rlz_test_helpers.h"
 
 #include <map>
 #include <vector>
@@ skipping 63 matching lines @@
     dest->WriteValue(value.name.c_str(),
                      value.data.size() ? &value.data[0] : NULL,
                      static_cast<DWORD>(value.data.size()),
                      value.type);
   }
 
   // Next write values recursively.
   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);
   }
 }
 
 // Initialize temporary HKLM/HKCU registry hives used for testing.
 // Testing RLZ requires reading and writing to the Windows registry.  To keep
 // the tests isolated from the machine's state, as well as to prevent the tests
 // from causing side effects in the registry, HKCU and HKLM are overridden for
 // the duration of the tests. RLZ tests don't expect the HKCU and KHLM hives to
 // be empty though, and this function initializes the minimum value needed so
 // that the test will run successfully.
@@ skipping 12 matching lines @@
     // This seems to be required since Win7.
     ReadRegistryTree(base::win::RegKey(HKEY_LOCAL_MACHINE,
                                        kHKLMAccessProviders,
                                        KEY_READ), &data);
   }
 
   override_manager->OverrideRegistry(HKEY_LOCAL_MACHINE, L"rlz_temp_hklm");
   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);
   }
 }
 
 }  // namespace
 
 #endif  // defined(OS_WIN)
 
 void RlzLibTestNoMachineState::SetUp() {
 #if defined(OS_WIN)
   InitializeRegistryOverridesForTesting(&override_manager_);
@@ skipping 11 matching lines @@
   rlz_lib::testing::SetRlzStoreDirectory(base::FilePath());
 #endif  // defined(OS_POSIX)
 }
 
 void RlzLibTestBase::SetUp() {
   RlzLibTestNoMachineState::SetUp();
 #if defined(OS_WIN)
   rlz_lib::CreateMachineState();
 #endif  // defined(OS_WIN)
 }