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

chrome/common/chrome_plugin_lib.cc

 // Copyright (c) 2006-2008 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/common/chrome_plugin_lib.h"
 
 #include "base/command_line.h"
 #include "base/hash_tables.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/perftimer.h"
 #include "base/thread.h"
 #if defined(OS_WIN)
-#include "base/registry.h"
+#include "base/win/registry.h"
 #endif
 #include "base/string_util.h"
 #include "chrome/common/chrome_counters.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "webkit/glue/plugins/plugin_list.h"
 
 using base::TimeDelta;
 
@@ skipping 116 matching lines @@
 
   // TODO(mpcomplete): disabled loading of plugins from the registry until we
   // phase out registry keys from the gears installer.
 #if 0
   for (RegistryKeyIterator iter(HKEY_CURRENT_USER, kRegistryChromePlugins);
        iter.Valid(); ++iter) {
     // Use the registry to gather plugin across the file system.
     std::wstring reg_path = kRegistryChromePlugins;
     reg_path.append(L"\\");
     reg_path.append(iter.Name());
-    RegKey key(HKEY_CURRENT_USER, reg_path.c_str());
+    base::win::RegKey key(HKEY_CURRENT_USER, reg_path.c_str());
 
     DWORD is_persistent;
     if (key.ReadValueDW(kRegistryLoadOnStartup, &is_persistent) &&
         is_persistent) {
       std::wstring path;
       if (key.ReadValue(kRegistryPath, &path)) {
         ChromePluginLib::Create(path, bfuncs);
       }
     }
   }
@@ skipping 119 matching lines @@
   if (initialized_)
     CP_Shutdown();
 
 #if defined(OS_WIN)
   if (module_) {
     FreeLibrary(module_);
     module_ = 0;
   }
 #endif
 }