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

webkit/glue/plugins/plugin_list_win.cc

 // 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 "webkit/glue/plugins/plugin_list.h"
 
 #include <tchar.h>
 
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
-#include "base/registry.h"
 #include "base/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
+#include "base/win/registry.h"
 #include "webkit/glue/plugins/plugin_constants_win.h"
 #include "webkit/glue/plugins/plugin_lib.h"
 #include "webkit/glue/webkit_glue.h"
 
 namespace {
 
 const TCHAR kRegistryApps[] =
     _T("Software\\Microsoft\\Windows\\CurrentVersion\\App Paths");
 const TCHAR kRegistryFirefox[] = _T("firefox.exe");
 const TCHAR kRegistryAcrobat[] = _T("Acrobat.exe");
@@ skipping 30 matching lines @@
   exe_path = exe_path.AppendASCII("plugins");
   plugin_dirs->insert(exe_path);
 }
 
 // Gets the installed path for a registered app.
 bool GetInstalledPath(const TCHAR* app, FilePath* out) {
   std::wstring reg_path(kRegistryApps);
   reg_path.append(L"\\");
   reg_path.append(app);
 
-  RegKey key(HKEY_LOCAL_MACHINE, reg_path.c_str(), KEY_READ);
+  base::win::RegKey key(HKEY_LOCAL_MACHINE, reg_path.c_str(), KEY_READ);
   std::wstring path;
   if (key.ReadValue(kRegistryPath, &path)) {
     *out = FilePath(path);
     return true;
   }
 
   return false;
 }
 
 // Search the registry at the given path and detect plugin directories.
 void GetPluginsInRegistryDirectory(
     HKEY root_key,
     const std::wstring& registry_folder,
     std::set<FilePath>* plugin_dirs) {
-  for (RegistryKeyIterator iter(root_key, registry_folder.c_str());
+  for (base::win::RegistryKeyIterator iter(root_key, registry_folder.c_str());
        iter.Valid(); ++iter) {
     // Use the registry to gather plugin across the file system.
     std::wstring reg_path = registry_folder;
     reg_path.append(L"\\");
     reg_path.append(iter.Name());
-    RegKey key(root_key, reg_path.c_str(), KEY_READ);
+    base::win::RegKey key(root_key, reg_path.c_str(), KEY_READ);
 
     std::wstring path;
     if (key.ReadValue(kRegistryPath, &path))
       plugin_dirs->insert(FilePath(path));
   }
 }
 
 // Enumerate through the registry key to find all installed FireFox paths.
 // FireFox 3 beta and version 2 can coexist. See bug: 1025003
 void GetFirefoxInstalledPaths(std::vector<FilePath>* out) {
-  RegistryKeyIterator it(HKEY_LOCAL_MACHINE, kRegistryFirefoxInstalled);
+  base::win::RegistryKeyIterator it(HKEY_LOCAL_MACHINE,
+                                    kRegistryFirefoxInstalled);
   for (; it.Valid(); ++it) {
     std::wstring full_path = std::wstring(kRegistryFirefoxInstalled) + L"\\" +
                              it.Name() + L"\\Main";
-    RegKey key(HKEY_LOCAL_MACHINE, full_path.c_str(), KEY_READ);
+    base::win::RegKey key(HKEY_LOCAL_MACHINE, full_path.c_str(), KEY_READ);
     std::wstring install_dir;
     if (!key.ReadValue(L"Install Directory", &install_dir))
       continue;
     out->push_back(FilePath(install_dir));
   }
 }
 
 // Get plugin directory locations from the Firefox install path.  This is kind
 // of a kludge, but it helps us locate the flash player for users that
 // already have it for firefox.  Not having to download yet-another-plugin
@@ skipping 56 matching lines @@
         next_drive = &next_drive[wcslen(next_drive) + 1];
       }
     }
   }
 }
 
 // Hardcoded logic to detect Java plugin location.
 void GetJavaDirectory(std::set<FilePath>* plugin_dirs) {
   // Load the new NPAPI Java plugin
   // 1. Open the main JRE key under HKLM
-  RegKey java_key(HKEY_LOCAL_MACHINE, kRegistryJava, KEY_QUERY_VALUE);
+  base::win::RegKey java_key(HKEY_LOCAL_MACHINE, kRegistryJava,
+                             KEY_QUERY_VALUE);
 
   // 2. Read the current Java version
   std::wstring java_version;
   if (!java_key.ReadValue(kRegistryBrowserJavaVersion, &java_version))
     java_key.ReadValue(kRegistryCurrentJavaVersion, &java_version);
 
   if (!java_version.empty()) {
     java_key.OpenKey(java_version.c_str(), KEY_QUERY_VALUE);
 
     // 3. Install path of the JRE binaries is specified in "JavaHome"
@@ skipping 205 matching lines @@
     for (size_t i = 0; i < plugins->size(); ++i) {
       if ((*plugins)[i].path.BaseName().value() == kNewWMPPlugin)
         return false;
     }
   }
 
   return true;
 }
 
 }  // namespace NPAPI