Fail tests fast if overriding the Windows registry fails.

base/test/test_reg_util_win.cc

 // Copyright (c) 2011 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.
 
 #include "base/test/test_reg_util_win.h"
 
 #include <stdint.h>
 
 #include "base/guid.h"
 #include "base/logging.h"
@@ skipping 52 matching lines @@
   key_path += kTimestampDelimiter + base::ASCIIToUTF16(base::GenerateGUID());
 
   return key_path;
 }
 
 }  // namespace
 
 RegistryOverrideManager::ScopedRegistryKeyOverride::ScopedRegistryKeyOverride(
     HKEY override,
     const base::string16& key_path)
-    : override_(override) {
-  EXPECT_EQ(
-      ERROR_SUCCESS,
-      temp_key_.Create(HKEY_CURRENT_USER, key_path.c_str(), KEY_ALL_ACCESS));
-  EXPECT_EQ(ERROR_SUCCESS,
-            ::RegOverridePredefKey(override_, temp_key_.Handle()));
-}
+    : override_(override), key_path_(key_path) {}
 
 RegistryOverrideManager::
     ScopedRegistryKeyOverride::~ScopedRegistryKeyOverride() {
   ::RegOverridePredefKey(override_, NULL);
-  temp_key_.DeleteKey(L"");
+  base::win::RegKey(HKEY_CURRENT_USER, L"", KEY_QUERY_VALUE)
+      .DeleteKey(key_path_.c_str());
 }
 
 RegistryOverrideManager::RegistryOverrideManager()
     : timestamp_(base::Time::Now()), test_key_root_(kTempTestKeyPath) {
   DeleteStaleTestKeys(timestamp_, test_key_root_);
 }
 
 RegistryOverrideManager::RegistryOverrideManager(
     const base::Time& timestamp,
     const base::string16& test_key_root)
     : timestamp_(timestamp), test_key_root_(test_key_root) {
   DeleteStaleTestKeys(timestamp_, test_key_root_);
 }
 
 RegistryOverrideManager::~RegistryOverrideManager() {}
 
 void RegistryOverrideManager::OverrideRegistry(HKEY override) {
   OverrideRegistry(override, nullptr);
 }
 
 void RegistryOverrideManager::OverrideRegistry(HKEY override,
                                                base::string16* override_path) {
   base::string16 key_path = GenerateTempKeyPath(test_key_root_, timestamp_);
+
+  base::win::RegKey temp_key;
+  ASSERT_EQ(ERROR_SUCCESS, temp_key.Create(HKEY_CURRENT_USER, key_path.c_str(),
+                                           KEY_ALL_ACCESS));
+  ASSERT_EQ(ERROR_SUCCESS, ::RegOverridePredefKey(override, temp_key.Handle()));
+
   overrides_.push_back(
       base::MakeUnique<ScopedRegistryKeyOverride>(override, key_path));
   if (override_path)
     override_path->assign(key_path);
 }
 
 base::string16 GenerateTempKeyPath() {
   return GenerateTempKeyPath(base::string16(kTempTestKeyPath),
                              base::Time::Now());
 }
 
 }  // namespace registry_util