Move pe_image and registry from base to base/win and use the namespace. It re...

chrome/installer/util/set_reg_value_work_item_unittest.cc

Index: chrome/installer/util/set_reg_value_work_item_unittest.cc
===================================================================
--- chrome/installer/util/set_reg_value_work_item_unittest.cc	(revision 62848)
+++ chrome/installer/util/set_reg_value_work_item_unittest.cc	(working copy)
@@ -5,37 +5,41 @@
 #include <windows.h>
 
 #include "base/file_util.h"
-#include "base/registry.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
+#include "base/win/registry.h"
 #include "chrome/installer/util/set_reg_value_work_item.h"
 #include "chrome/installer/util/work_item.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using base::win::RegKey;
+
 namespace {
-  wchar_t test_root[] = L"TempTemp";
-  wchar_t data_str_1[] = L"data_111";
-  wchar_t data_str_2[] = L"data_222";
-  DWORD dword1 = 0;
-  DWORD dword2 = 1;
-  class SetRegValueWorkItemTest : 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));
-    }
-    virtual void TearDown() {
-      logging::CloseLogFile();
-      // Clean up the temporary key
-      RegKey key(HKEY_CURRENT_USER, L"", KEY_ALL_ACCESS);
-      ASSERT_TRUE(key.DeleteKey(test_root));
-    }
-  };
+
+wchar_t test_root[] = L"TempTemp";
+wchar_t data_str_1[] = L"data_111";
+wchar_t data_str_2[] = L"data_222";
+DWORD dword1 = 0;
+DWORD dword2 = 1;
+class SetRegValueWorkItemTest : 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));
+  }
+  virtual void TearDown() {
+    logging::CloseLogFile();
+    // Clean up the temporary key
+    RegKey key(HKEY_CURRENT_USER, L"", KEY_ALL_ACCESS);
+    ASSERT_TRUE(key.DeleteKey(test_root));
+  }
 };
 
+}  // namespace
+
 // Write a new value without overwrite flag. The value should be set.
 TEST_F(SetRegValueWorkItemTest, WriteNewNonOverwrite) {
   RegKey key;