1 files changed, 38 insertions, 34 deletions
diff --git a/chrome/installer/util/work_item_list_unittest.cc b/chrome/installer/util/work_item_list_unittest.cc
index 8b91fcd..1ba6e52 100644
--- a/chrome/installer/util/work_item_list_unittest.cc
+++ b/chrome/installer/util/work_item_list_unittest.cc
@@ -7,49 +7,53 @@
 #include "base/base_paths.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
-#include "base/registry.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
+#include "base/win/registry.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 {
-  wchar_t test_root[] = L"ListList";
-  wchar_t data_str[] = L"data_111";
-
-  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(test_root);
-      ASSERT_FALSE(key.Open(HKEY_CURRENT_USER, test_root, KEY_READ));
-      ASSERT_TRUE(key.Create(HKEY_CURRENT_USER, test_root, KEY_READ));
-
-      // Create a temp directory for test.
-      ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &test_dir_));
-      test_dir_ = test_dir_.AppendASCII("WorkItemListTest");
-      file_util::Delete(test_dir_, true);
-      ASSERT_FALSE(file_util::PathExists(test_dir_));
-      file_util::CreateDirectoryW(test_dir_);
-      ASSERT_TRUE(file_util::PathExists(test_dir_));
-    }
-
-    virtual void TearDown() {
-      logging::CloseLogFile();
-      // Clean up test directory
-      ASSERT_TRUE(file_util::Delete(test_dir_, true));
-      ASSERT_FALSE(file_util::PathExists(test_dir_));
-      // Clean up the temporary key
-      RegKey key(HKEY_CURRENT_USER, L"", KEY_ALL_ACCESS);
-      ASSERT_TRUE(key.DeleteKey(test_root));
-    }
-
-    FilePath test_dir_;
-  };
+
+wchar_t test_root[] = L"ListList";
+wchar_t data_str[] = L"data_111";
+
+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(test_root);
+    ASSERT_FALSE(key.Open(HKEY_CURRENT_USER, test_root, KEY_READ));
+    ASSERT_TRUE(key.Create(HKEY_CURRENT_USER, test_root, KEY_READ));
+
+    // Create a temp directory for test.
+    ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &test_dir_));
+    test_dir_ = test_dir_.AppendASCII("WorkItemListTest");
+    file_util::Delete(test_dir_, true);
+    ASSERT_FALSE(file_util::PathExists(test_dir_));
+    file_util::CreateDirectoryW(test_dir_);
+    ASSERT_TRUE(file_util::PathExists(test_dir_));
+  }
+
+  virtual void TearDown() {
+    logging::CloseLogFile();
+    // Clean up test directory
+    ASSERT_TRUE(file_util::Delete(test_dir_, true));
+    ASSERT_FALSE(file_util::PathExists(test_dir_));
+    // Clean up the temporary key
+    RegKey key(HKEY_CURRENT_USER, L"", KEY_ALL_ACCESS);
+    ASSERT_TRUE(key.DeleteKey(test_root));
+  }
+
+  FilePath test_dir_;
 };
 
+}  // namespace
+
 // Execute a WorkItem list successfully and then rollback.
 TEST_F(WorkItemListTest, ExecutionSuccess) {
   scoped_ptr<WorkItemList> work_item_list(WorkItem::CreateWorkItemList());