Move pe_image and registry from base to base/win and use the namespace. It removes windows_message_list which isn't used.

This keeps a stub for registry in the old location until we can update that.

TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/3836005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62888 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 9 insertions, 8 deletions

diff --git a/net/base/platform_mime_util_win.cc b/net/base/platform_mime_util_win.cc
index bffb81a..b93008b 100644
--- a/net/base/platform_mime_util_win.cc
+++ b/net/base/platform_mime_util_win.cc
@@ -6,8 +6,8 @@
 
 #include "net/base/platform_mime_util.h"
 
-#include "base/registry.h"
 #include "base/utf_string_conversions.h"
+#include "base/win/registry.h"
 
 namespace net {
 
@@ -16,8 +16,8 @@ bool PlatformMimeUtil::GetPlatformMimeTypeFromExtension(
   // check windows registry for file extension's mime type (registry key
   // names are not case-sensitive).
   std::wstring value, key = L"." + ext;
-  RegKey(HKEY_CLASSES_ROOT, key.c_str(), KEY_READ).ReadValue(L"Content Type",
-                                                             &value);
+  base::win::RegKey(HKEY_CLASSES_ROOT, key.c_str(), KEY_READ).ReadValue(
+      L"Content Type", &value);
   if (!value.empty()) {
     *result = WideToUTF8(value);
     return true;
@@ -28,8 +28,8 @@ bool PlatformMimeUtil::GetPlatformMimeTypeFromExtension(
 bool PlatformMimeUtil::GetPreferredExtensionForMimeType(
     const std::string& mime_type, FilePath::StringType* ext) const {
   std::wstring key(L"MIME\\Database\\Content Type\\" + UTF8ToWide(mime_type));
-  if (!RegKey(HKEY_CLASSES_ROOT, key.c_str(), KEY_READ).ReadValue(L"Extension",
-                                                                  ext)) {
+  if (!base::win::RegKey(HKEY_CLASSES_ROOT, key.c_str(), KEY_READ).ReadValue(
+          L"Extension", ext)) {
     return false;
   }
   // Strip off the leading dot, this should always be the case.
diff --git a/net/base/ssl_config_service_win.cc b/net/base/ssl_config_service_win.cc
index 82f44bf..14c4d24 100644
--- a/net/base/ssl_config_service_win.cc
+++ b/net/base/ssl_config_service_win.cc
@@ -4,10 +4,11 @@
 
 #include "net/base/ssl_config_service_win.h"
 
-#include "base/registry.h"
+#include "base/win/registry.h"
 
 using base::TimeDelta;
 using base::TimeTicks;
+using base::win::RegKey;
 
 namespace net {
 
diff --git a/net/proxy/proxy_config_service_win.cc b/net/proxy/proxy_config_service_win.cc
index 1cd8a8c..d0a387f 100644
--- a/net/proxy/proxy_config_service_win.cc
+++ b/net/proxy/proxy_config_service_win.cc
@@ -8,11 +8,11 @@
 #include <winhttp.h>
 
 #include "base/logging.h"
-#include "base/registry.h"
 #include "base/scoped_ptr.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "base/stl_util-inl.h"
+#include "base/win/registry.h"
 #include "net/base/net_errors.h"
 #include "net/proxy/proxy_config.h"
 
@@ -61,7 +61,7 @@ class ProxyConfigServiceWin::KeyEntry {
   }
 
  private:
-  RegKey key_;
+  base::win::RegKey key_;
   base::ObjectWatcher watcher_;
 };