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

chrome/installer/util/install_util_unittest.cc

Index: chrome/installer/util/install_util_unittest.cc
===================================================================
--- chrome/installer/util/install_util_unittest.cc	(revision 97629)
+++ chrome/installer/util/install_util_unittest.cc	(working copy)
@@ -6,6 +6,7 @@
 #include <utility>
 
 #include "base/command_line.h"
+#include "base/test/test_reg_util_win.h"
 #include "base/win/registry.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/install_util.h"
@@ -13,6 +14,8 @@
 #include "testing/gmock/include/gmock/gmock.h"
 
 using base::win::RegKey;
+using registry_util::ScopedRegistryKeyOverride;
+using registry_util::ScopedRegistryTempPathCleanup;
 using ::testing::_;
 using ::testing::Return;
 using ::testing::StrEq;
@@ -76,7 +79,8 @@
 
   // Update the stage when there's no "ap" value.
   {
-    TempRegKeyOverride override(root, L"root_inst_res");
+    ScopedRegistryTempPathCleanup cleanup;
+    ScopedRegistryKeyOverride override(root, L"root_inst_res");
     RegKey(root, state_key_path.c_str(), KEY_SET_VALUE);
     InstallUtil::UpdateInstallerStage(system_level, state_key_path,
                                       installer::BUILDING);
@@ -86,11 +90,11 @@
                   .ReadValue(google_update::kRegApField, &value));
     EXPECT_EQ(L"-stage:building", value);
   }
-  TempRegKeyOverride::DeleteAllTempKeys();
 
   // Update the stage when there is an "ap" value.
   {
-    TempRegKeyOverride override(root, L"root_inst_res");
+    ScopedRegistryTempPathCleanup cleanup;
+    ScopedRegistryKeyOverride override(root, L"root_inst_res");
     RegKey(root, state_key_path.c_str(), KEY_SET_VALUE)
         .WriteValue(google_update::kRegApField, L"2.0-dev");
     InstallUtil::UpdateInstallerStage(system_level, state_key_path,
@@ -101,11 +105,11 @@
                   .ReadValue(google_update::kRegApField, &value));
     EXPECT_EQ(L"2.0-dev-stage:building", value);
   }
-  TempRegKeyOverride::DeleteAllTempKeys();
 
   // Clear the stage.
   {
-    TempRegKeyOverride override(root, L"root_inst_res");
+    ScopedRegistryTempPathCleanup cleanup;
+    ScopedRegistryKeyOverride override(root, L"root_inst_res");
     RegKey(root, state_key_path.c_str(), KEY_SET_VALUE)
       .WriteValue(google_update::kRegApField, L"2.0-dev-stage:building");
     InstallUtil::UpdateInstallerStage(system_level, state_key_path,
@@ -116,7 +120,6 @@
                   .ReadValue(google_update::kRegApField, &value));
     EXPECT_EQ(L"2.0-dev", value);
   }
-  TempRegKeyOverride::DeleteAllTempKeys();
 }
 
 TEST_F(InstallUtilTest, UpdateInstallerStage) {
@@ -126,7 +129,8 @@
 
   // Update the stage when there's no "InstallerExtraCode1" value.
   {
-    TempRegKeyOverride override(root, L"root_inst_res");
+    ScopedRegistryTempPathCleanup cleanup;
+    ScopedRegistryKeyOverride override(root, L"root_inst_res");
     RegKey(root, state_key_path.c_str(), KEY_SET_VALUE)
         .DeleteValue(installer::kInstallerExtraCode1);
     InstallUtil::UpdateInstallerStage(system_level, state_key_path,
@@ -137,11 +141,11 @@
                   .ReadValueDW(installer::kInstallerExtraCode1, &value));
     EXPECT_EQ(static_cast<DWORD>(installer::BUILDING), value);
   }
-  TempRegKeyOverride::DeleteAllTempKeys();
 
   // Update the stage when there is an "InstallerExtraCode1" value.
   {
-    TempRegKeyOverride override(root, L"root_inst_res");
+    ScopedRegistryTempPathCleanup cleanup;
+    ScopedRegistryKeyOverride override(root, L"root_inst_res");
     RegKey(root, state_key_path.c_str(), KEY_SET_VALUE)
         .WriteValue(installer::kInstallerExtraCode1,
                     static_cast<DWORD>(installer::UNPACKING));
@@ -153,11 +157,11 @@
                   .ReadValueDW(installer::kInstallerExtraCode1, &value));
     EXPECT_EQ(static_cast<DWORD>(installer::BUILDING), value);
   }
-  TempRegKeyOverride::DeleteAllTempKeys();
 
   // Clear the stage.
   {
-    TempRegKeyOverride override(root, L"root_inst_res");
+    ScopedRegistryTempPathCleanup cleanup;
+    ScopedRegistryKeyOverride override(root, L"root_inst_res");
     RegKey(root, state_key_path.c_str(), KEY_SET_VALUE)
         .WriteValue(installer::kInstallerExtraCode1, static_cast<DWORD>(5));
     InstallUtil::UpdateInstallerStage(system_level, state_key_path,
@@ -167,7 +171,6 @@
               RegKey(root, state_key_path.c_str(), KEY_QUERY_VALUE)
                   .ReadValueDW(installer::kInstallerExtraCode1, &value));
   }
-  TempRegKeyOverride::DeleteAllTempKeys();
 }
 
 TEST_F(InstallUtilTest, DeleteRegistryKeyIf) {
@@ -179,7 +182,8 @@
   const wchar_t value[] = L"hi mom";
 
   {
-    TempRegKeyOverride override(root, L"root_key");
+    ScopedRegistryTempPathCleanup cleanup;
+    ScopedRegistryKeyOverride override(root, L"root_key");
     // Nothing to delete if the keys aren't even there.
     {
       MockRegistryValuePredicate pred;
@@ -245,7 +249,6 @@
                           KEY_QUERY_VALUE).Valid());
     }
   }
-  TempRegKeyOverride::DeleteAllTempKeys();
 }
 
 TEST_F(InstallUtilTest, DeleteRegistryValueIf) {
@@ -255,7 +258,8 @@
   const wchar_t value[] = L"hi mom";
 
   {
-    TempRegKeyOverride override(root, L"root_key");
+    ScopedRegistryTempPathCleanup cleanup;
+    ScopedRegistryKeyOverride override(root, L"root_key");
     // Nothing to delete if the key isn't even there.
     {
       MockRegistryValuePredicate pred;
@@ -308,10 +312,10 @@
                           KEY_QUERY_VALUE).ValueExists(value_name));
     }
   }
-  TempRegKeyOverride::DeleteAllTempKeys();
 
   {
-    TempRegKeyOverride override(root, L"root_key");
+    ScopedRegistryTempPathCleanup cleanup;
+    ScopedRegistryKeyOverride override(root, L"root_key");
     // Default value matches: delete.
     {
       MockRegistryValuePredicate pred;
@@ -327,7 +331,6 @@
                           KEY_QUERY_VALUE).ValueExists(L""));
     }
   }
-  TempRegKeyOverride::DeleteAllTempKeys();
 }
 
 TEST_F(InstallUtilTest, ValueEquals) {