Migrate WorkItemListTest to use RegistryOverrideManager instead of rolling its own attempt at temp …

chrome/installer/util/work_item_list_unittest.cc

 // Copyright (c) 2012 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 <windows.h>
 
 #include "base/base_paths.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
+#include "base/test/test_reg_util_win.h"
 #include "base/win/registry.h"
 #include "chrome/installer/util/conditional_work_item_list.h"
 #include "chrome/installer/util/work_item.h"
 #include "chrome/installer/util/work_item_list.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::win::RegKey;
 
 namespace {
 
 const wchar_t kTestRoot[] = L"ListList";
 const wchar_t kDataStr[] = L"data_111";
 const wchar_t kName[] = L"name";
 
 class WorkItemListTest : public testing::Test {
  protected:
   virtual void SetUp() {
-    // Create a temporary key for testing
-    RegKey key(HKEY_CURRENT_USER, L"", KEY_ALL_ACCESS);
-    key.DeleteKey(kTestRoot);
-    ASSERT_NE(ERROR_SUCCESS, key.Open(HKEY_CURRENT_USER, kTestRoot, KEY_READ));
-    ASSERT_EQ(ERROR_SUCCESS,
-        key.Create(HKEY_CURRENT_USER, kTestRoot, KEY_READ));
-
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
+    registry_override_manager_.OverrideRegistry(HKEY_CURRENT_USER, L"root_pit");

[grt (UTC plus 2), 2014/07/23 22:03:59]

this is so much better. thank you for doing the right thing. these tests can now
run in parallel.

   }
 
   virtual void TearDown() {
     logging::CloseLogFile();
-
-    // Clean up the temporary key
-    RegKey key(HKEY_CURRENT_USER, L"", KEY_ALL_ACCESS);
-    ASSERT_EQ(ERROR_SUCCESS, key.DeleteKey(kTestRoot));
   }
 
   base::ScopedTempDir temp_dir_;
+  registry_util::RegistryOverrideManager registry_override_manager_;
 };
 
 }  // namespace
 
 // Execute a WorkItem list successfully and then rollback.
-// http://crbug.com/396405
-TEST_F(WorkItemListTest, DISABLED_ExecutionSuccess) {
+TEST_F(WorkItemListTest, ExecutionSuccess) {
   scoped_ptr<WorkItemList> work_item_list(WorkItem::CreateWorkItemList());
   scoped_ptr<WorkItem> work_item;
 
   base::FilePath top_dir_to_create(temp_dir_.path());
   top_dir_to_create = top_dir_to_create.AppendASCII("a");
   base::FilePath dir_to_create(top_dir_to_create);
   dir_to_create = dir_to_create.AppendASCII("b");
   ASSERT_FALSE(base::PathExists(dir_to_create));
 
   work_item.reset(reinterpret_cast<WorkItem*>(
@@ skipping 160 matching lines @@
   work_item_list->Rollback();
 
   // Verify everything is rolled back.
   // The value must have been deleted first in roll back otherwise the key
   // can not be deleted.
   EXPECT_NE(ERROR_SUCCESS,
       key.Open(HKEY_CURRENT_USER, key_to_create.c_str(), KEY_READ));
   EXPECT_FALSE(base::PathExists(top_dir_to_create));
 }
 
-// http://crbug.com/396405
-TEST_F(WorkItemListTest, DISABLED_ConditionalExecutionConditionFailure) {
+TEST_F(WorkItemListTest, ConditionalExecutionConditionFailure) {
   scoped_ptr<WorkItemList> work_item_list(WorkItem::CreateWorkItemList());
   scoped_ptr<WorkItem> work_item;
 
   base::FilePath top_dir_to_create(temp_dir_.path());
   top_dir_to_create = top_dir_to_create.AppendASCII("a");
   base::FilePath dir_to_create(top_dir_to_create);
   dir_to_create = dir_to_create.AppendASCII("b");
   ASSERT_FALSE(base::PathExists(dir_to_create));
 
   work_item.reset(reinterpret_cast<WorkItem*>(
@@ skipping 41 matching lines @@
 
   work_item_list->Rollback();
 
   // Verify everything is rolled back.
   // The value must have been deleted first in roll back otherwise the key
   // can not be deleted.
   EXPECT_NE(ERROR_SUCCESS,
       key.Open(HKEY_CURRENT_USER, key_to_create.c_str(), KEY_READ));
   EXPECT_FALSE(base::PathExists(top_dir_to_create));
 }