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

chrome/browser/plugin_service.h

 // 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.
 
 // This class responds to requests from renderers for the list of plugins, and
 // also a proxy object for plugin instances.
 
 #ifndef CHROME_BROWSER_PLUGIN_SERVICE_H_
 #define CHROME_BROWSER_PLUGIN_SERVICE_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/hash_tables.h"
 #include "base/singleton.h"
 #include "base/waitable_event_watcher.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "googleurl/src/gurl.h"
 
 #if defined(OS_WIN)
-#include "base/registry.h"
 #include "base/scoped_ptr.h"
+#include "base/win/registry.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 namespace chromeos {
 class PluginSelectionPolicy;
 }
 #endif
 
 namespace IPC {
 class Message;
@@ skipping 125 matching lines @@
   PrivatePluginMap private_plugins_;
 
   NotificationRegistrar registrar_;
 
 #if defined(OS_CHROMEOS)
   scoped_refptr<chromeos::PluginSelectionPolicy> plugin_selection_policy_;
 #endif
 
 #if defined(OS_WIN)
   // Registry keys for getting notifications when new plugins are installed.
-  RegKey hkcu_key_;
-  RegKey hklm_key_;
+  base::win::RegKey hkcu_key_;
+  base::win::RegKey hklm_key_;
   scoped_ptr<base::WaitableEvent> hkcu_event_;
   scoped_ptr<base::WaitableEvent> hklm_event_;
   base::WaitableEventWatcher hkcu_watcher_;
   base::WaitableEventWatcher hklm_watcher_;
 #endif
 
   // Set to true if chrome plugins are enabled. Defaults to true.
   static bool enable_chrome_plugins_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginService);
 };
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(PluginService);
 
 #endif  // CHROME_BROWSER_PLUGIN_SERVICE_H_