Random bits of de-Winification for WebContents.

chrome/browser/plugin_service.h

 // 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.
 
 // 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__
+#ifndef CHROME_BROWSER_PLUGIN_SERVICE_H_
+#define CHROME_BROWSER_PLUGIN_SERVICE_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
 #include "base/lock.h"
 #include "chrome/browser/browser_process.h"
 #include "webkit/glue/webplugin.h"
 
 namespace IPC {
@@ skipping 114 matching lines @@
   FilePath chrome_plugin_data_dir_;
 
   // The browser's UI locale.
   const std::wstring ui_locale_;
 
   // Need synchronization whenever we access the plugin_list singelton through
   // webkit_glue since this class is called on the main and IO thread.
   Lock lock_;
 
   // Handles plugin process shutdown.
-  class ShutdownHandler :
-      public base::RefCountedThreadSafe<ShutdownHandler> {
+  class ShutdownHandler : public base::RefCountedThreadSafe<ShutdownHandler> {
    public:
      ShutdownHandler() {}
      ~ShutdownHandler() {}
 
      // Initiates plugin process shutdown. Ensures that the actual shutdown
      // happens on the io thread.
      void InitiateShutdown();
 
    private:
-     // Shutdown handler which runs on the io thread.
-     void OnShutdown();
+    // Shutdown handler which runs on the io thread.
+    void OnShutdown();
 
-     DISALLOW_EVIL_CONSTRUCTORS(ShutdownHandler);
+    DISALLOW_COPY_AND_ASSIGN(ShutdownHandler);
   };
 
   friend class ShutdownHandler;
   scoped_refptr<ShutdownHandler> plugin_shutdown_handler_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(PluginService);
+  DISALLOW_COPY_AND_ASSIGN(PluginService);
 };
 
 // The PluginProcessHostIterator allows to iterate through all the
 // PluginProcessHosts. Note that this should be done from the IO thread and that
 // the iterator should not be kept around as it may be invalidated on
 // subsequent event processing in the event loop.
 class PluginProcessHostIterator {
  public:
   PluginProcessHostIterator();
   PluginProcessHostIterator(const PluginProcessHostIterator& instance);
@@ skipping 32 matching lines @@
 
   bool Done() {
     return (iterator_ == end_);
   }
 
  private:
   PluginService::PluginMap::const_iterator iterator_;
   PluginService::PluginMap::const_iterator end_;
 };
 
-#endif  // CHROME_BROWSER_PLUGIN_SERVICE_H__
+#endif  // CHROME_BROWSER_PLUGIN_SERVICE_H_