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

chrome_frame/test/util_unittests.cc

Index: chrome_frame/test/util_unittests.cc
===================================================================
--- chrome_frame/test/util_unittests.cc	(revision 97629)
+++ chrome_frame/test/util_unittests.cc	(working copy)
@@ -16,7 +16,7 @@
 #include "testing/gmock/include/gmock/gmock.h"
 
 using base::win::RegKey;
-using chrome_frame_test::TempRegKeyOverride;
+using registry_util::ScopedRegistryKeyOverride;
 
 const wchar_t kChannelName[] = L"-dev";
 const wchar_t kSuffix[] = L"-fix";
@@ -31,23 +31,25 @@
 class UtilTests : public testing::Test {
  protected:
   void SetUp() {
-    TempRegKeyOverride::DeleteAllTempKeys();
+    ScopedRegistryKeyOverride::DeleteAllTempKeys();
     DeleteAllSingletons();
 
-    hklm_pol_.reset(new TempRegKeyOverride(HKEY_LOCAL_MACHINE, L"hklm_fake"));
-    hkcu_pol_.reset(new TempRegKeyOverride(HKEY_CURRENT_USER, L"hkcu_fake"));
+    hklm_pol_.reset(new ScopedRegistryKeyOverride(HKEY_LOCAL_MACHINE,
+                                                  L"hklm_fake"));
+    hkcu_pol_.reset(new ScopedRegistryKeyOverride(HKEY_CURRENT_USER,
+                                                  L"hkcu_fake"));
   }
 
   void TearDown() {
     hkcu_pol_.reset(NULL);
     hklm_pol_.reset(NULL);
-    TempRegKeyOverride::DeleteAllTempKeys();
+    ScopedRegistryKeyOverride::DeleteAllTempKeys();
   }
 
   // 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_;
+  scoped_ptr<ScopedRegistryKeyOverride> hklm_pol_;
+  scoped_ptr<ScopedRegistryKeyOverride> hkcu_pol_;
 };
 
 TEST_F(UtilTests, GetModuleVersionTest) {