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

base/win_util.cc

Index: base/win_util.cc
===================================================================
--- base/win_util.cc	(revision 62848)
+++ base/win_util.cc	(working copy)
@@ -12,7 +12,7 @@
 #include <shlobj.h>
 
 #include "base/logging.h"
-#include "base/registry.h"
+#include "base/win/registry.h"
 #include "base/scoped_handle.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
@@ -127,7 +127,7 @@
 }
 
 bool UserAccountControlIsEnabled() {
-  RegKey key(HKEY_LOCAL_MACHINE,
+  base::win::RegKey key(HKEY_LOCAL_MACHINE,
       L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Policies\\System",
       KEY_READ);
   DWORD uac_enabled;
@@ -187,12 +187,12 @@
 
 bool AddCommandToAutoRun(HKEY root_key, const string16& name,
                          const string16& command) {
-  RegKey autorun_key(root_key, kAutoRunKeyPath, KEY_SET_VALUE);
+  base::win::RegKey autorun_key(root_key, kAutoRunKeyPath, KEY_SET_VALUE);
   return autorun_key.WriteValue(name.c_str(), command.c_str());
 }
 
 bool RemoveCommandFromAutoRun(HKEY root_key, const string16& name) {
-  RegKey autorun_key(root_key, kAutoRunKeyPath, KEY_SET_VALUE);
+  base::win::RegKey autorun_key(root_key, kAutoRunKeyPath, KEY_SET_VALUE);
   return autorun_key.DeleteValue(name.c_str());
 }