Tommi: I need an owner review for the chrome frame changes.

chrome/installer/util/product_unittest.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 "chrome/installer/util/product_unittest.h"
 
 #include "base/logging.h"
+#include "base/test/test_reg_util_win.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/installer/util/chrome_frame_distribution.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/installation_state.h"
 #include "chrome/installer/util/installer_state.h"
 #include "chrome/installer/util/master_preferences.h"
 #include "chrome/installer/util/product.h"
 
 using base::win::RegKey;
 using installer::Product;
 using installer::MasterPreferences;
+using registry_util::ScopedRegistryKeyOverride;
 
 void TestWithTempDir::SetUp() {
   // Name a subdirectory of the user temp directory.
   ASSERT_TRUE(test_dir_.CreateUniqueTempDir());
 }
 
 void TestWithTempDir::TearDown() {
   logging::CloseLogFile();
   ASSERT_TRUE(test_dir_.Delete());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 void TestWithTempDirAndDeleteTempOverrideKeys::SetUp() {
-  TempRegKeyOverride::DeleteAllTempKeys();
+  ScopedRegistryKeyOverride::DeleteAllTempKeys();
   TestWithTempDir::SetUp();
 }
 
 void TestWithTempDirAndDeleteTempOverrideKeys::TearDown() {
   TestWithTempDir::TearDown();
-  TempRegKeyOverride::DeleteAllTempKeys();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-const wchar_t TempRegKeyOverride::kTempTestKeyPath[] =
-    L"Software\\Chromium\\TempTestKeys";
-
-TempRegKeyOverride::TempRegKeyOverride(HKEY override, const wchar_t* temp_name)
-    : override_(override), temp_name_(temp_name) {
-  DCHECK(temp_name && lstrlenW(temp_name));
-  std::wstring key_path(kTempTestKeyPath);
-  key_path += L"\\" + temp_name_;
-  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()));
-}
-
-TempRegKeyOverride::~TempRegKeyOverride() {
-  ::RegOverridePredefKey(override_, NULL);
-  // The temp key will be deleted via a call to DeleteAllTempKeys().
-}
-
-// static
-void TempRegKeyOverride::DeleteAllTempKeys() {
-  RegKey key;
-  if (key.Open(HKEY_CURRENT_USER, L"", KEY_ALL_ACCESS) == ERROR_SUCCESS) {
-    key.DeleteKey(kTempTestKeyPath);
-  }
+  ScopedRegistryKeyOverride::DeleteAllTempKeys();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 class ProductTest : public TestWithTempDirAndDeleteTempOverrideKeys {
  protected:
 };
 
 TEST_F(ProductTest, ProductInstallBasic) {
   // TODO(tommi): We should mock this and use our mocked distribution.
@@ skipping 25 matching lines @@
   EXPECT_EQ(std::wstring::npos,
             user_data.value().find(program_files.value()));
 
   // There should be no installed version in the registry.
   machine_state.Initialize();
   EXPECT_TRUE(machine_state.GetProductState(
       system_level, distribution->GetType()) == NULL);
 
   HKEY root = installer_state.root_key();
   {
-    TempRegKeyOverride override(root, L"root_pit");
+    ScopedRegistryKeyOverride override(root, L"root_pit");
 
     // Let's pretend chrome is installed.
     RegKey version_key(root, distribution->GetVersionKey().c_str(),
                        KEY_ALL_ACCESS);
     ASSERT_TRUE(version_key.Valid());
 
     const char kCurrentVersion[] = "1.2.3.4";
     scoped_ptr<Version> current_version(
         Version::GetVersionFromString(kCurrentVersion));
     version_key.WriteValue(google_update::kRegVersionField,
@@ skipping 24 matching lines @@
     if (chrome_state != NULL)
       EXPECT_TRUE(chrome_state->is_msi());
   }
 }
 
 TEST_F(ProductTest, LaunchChrome) {
   // TODO(tommi): Test Product::LaunchChrome and
   // Product::LaunchChromeAndWait.
   LOG(ERROR) << "Test not implemented.";
 }