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

chrome_frame/test/util_unittests.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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/file_path.h"
 #include "base/file_version_info.h"
 #include "base/file_version_info_win.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "chrome_frame/navigation_constraints.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 #include "chrome_frame/utils.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using base::win::RegKey;
-using chrome_frame_test::TempRegKeyOverride;
 
 const wchar_t kChannelName[] = L"-dev";
 const wchar_t kSuffix[] = L"-fix";
 
 // Registry override in the UtilsTest will cause shell APIs to fail
 // So separate this test from the rest
 TEST(SimpleUtilTests, GetTempInternetFiles) {
   FilePath path = GetIETemporaryFilesFolder();
   EXPECT_FALSE(path.empty());
 }
 
 class UtilTests : public testing::Test {
  protected:
   void SetUp() {
-    TempRegKeyOverride::DeleteAllTempKeys();
     DeleteAllSingletons();
-
-    hklm_pol_.reset(new TempRegKeyOverride(HKEY_LOCAL_MACHINE, L"hklm_fake"));
-    hkcu_pol_.reset(new TempRegKeyOverride(HKEY_CURRENT_USER, L"hkcu_fake"));
   }
 
   void TearDown() {
-    hkcu_pol_.reset(NULL);
-    hklm_pol_.reset(NULL);
-    TempRegKeyOverride::DeleteAllTempKeys();
+    registry_virtualization_.RemoveAllOverrides();
   }
 
   // This is used to manage life cycle of PolicySettings singleton.
   // base::ShadowingAtExitManager at_exit_manager_;
-  scoped_ptr<TempRegKeyOverride> hklm_pol_;
-  scoped_ptr<TempRegKeyOverride> hkcu_pol_;
+  chrome_frame_test::ScopedVirtualizeHklmAndHkcu registry_virtualization_;
 };
 
 TEST_F(UtilTests, GetModuleVersionTest) {
   HMODULE mod = GetModuleHandle(L"kernel32.dll");
   EXPECT_NE(mod, static_cast<HMODULE>(NULL));
   wchar_t path[MAX_PATH] = {0};
   GetModuleFileName(mod, path, arraysize(path));
 
   // Use the method that goes to disk
   scoped_ptr<FileVersionInfo> base_info(
@@ skipping 482 matching lines @@
 
       ASSERT_EQ(expect_match,
                 CheckXUaCompatibleDirective(test.header_value,
                                             all_versions[version_index]))
           << "Expect '" << test.header_value << "' to "
           << (expect_match ? "match" : "not match") << " IE major version "
           << all_versions[version_index];
     }
   }
 }