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

chrome/browser/extensions/external_registry_extension_provider_win.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 "chrome/browser/extensions/external_registry_extension_provider_win.h"
 
 #include "base/file_path.h"
-#include "base/registry.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/version.h"
+#include "base/win/registry.h"
 
 // The Registry hive where to look for external extensions.
 const HKEY kRegRoot = HKEY_LOCAL_MACHINE;
 
 // The Registry subkey that contains information about external extensions.
 const char kRegistryExtensions[] = "Software\\Google\\Chrome\\Extensions";
 
 // Registry value of of that key that defines the path to the .crx file.
 const wchar_t kRegistryExtensionPath[] = L"path";
 
 // Registry value of that key that defines the current version of the .crx file.
 const wchar_t kRegistryExtensionVersion[] = L"version";
 
 ExternalRegistryExtensionProvider::ExternalRegistryExtensionProvider() {
 }
 
 ExternalRegistryExtensionProvider::~ExternalRegistryExtensionProvider() {
 }
 
 void ExternalRegistryExtensionProvider::VisitRegisteredExtension(
     Visitor* visitor, const std::set<std::string>& ids_to_ignore) const {
-  RegistryKeyIterator iterator(kRegRoot,
-                               ASCIIToWide(kRegistryExtensions).c_str());
+  base::win::RegistryKeyIterator iterator(
+      kRegRoot, ASCIIToWide(kRegistryExtensions).c_str());
   while (iterator.Valid()) {
-    RegKey key;
+    base::win::RegKey key;
     std::wstring key_path = ASCIIToWide(kRegistryExtensions);
     key_path.append(L"\\");
     key_path.append(iterator.Name());
     if (key.Open(kRegRoot, key_path.c_str(), KEY_READ)) {
       std::wstring extension_path;
       if (key.ReadValue(kRegistryExtensionPath, &extension_path)) {
         std::wstring extension_version;
         if (key.ReadValue(kRegistryExtensionVersion, &extension_version)) {
           std::string id = WideToASCII(iterator.Name());
           StringToLowerASCII(&id);
@@ skipping 24 matching lines @@
                    << " for key " << key_path;
       }
     }
     ++iterator;
   }
 }
 
 Version* ExternalRegistryExtensionProvider::RegisteredVersion(
     const std::string& id,
     Extension::Location* location) const  {
-  RegKey key;
+  base::win::RegKey key;
   std::wstring key_path = ASCIIToWide(kRegistryExtensions);
   key_path.append(L"\\");
   key_path.append(ASCIIToWide(id));
 
   if (!key.Open(kRegRoot, key_path.c_str(), KEY_READ))
     return NULL;
 
   std::wstring extension_version;
   if (!key.ReadValue(kRegistryExtensionVersion, &extension_version))
     return NULL;
 
   if (location)
     *location = Extension::EXTERNAL_REGISTRY;
   return Version::GetVersionFromString(extension_version);
 }