Reverting 27389.

chrome/browser/chrome_plugin_host.cc

 // Copyright (c) 2009 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/chrome_plugin_host.h"
 
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 349 matching lines @@
 
   // The window this dialog box should be parented to, or NULL for the last
   // active browser window.
   gfx::NativeWindow parent_wnd_;
 
   DISALLOW_EVIL_CONSTRUCTORS(ModelessHtmlDialogDelegate);
 };
 
 // Allows InvokeLater without adding refcounting.  The object is only deleted
 // when its last InvokeLater is run anyway.
-template<>
-void RunnableMethodTraits<ModelessHtmlDialogDelegate>::RetainCallee(
-    ModelessHtmlDialogDelegate* remover) {
-}
-template<>
-void RunnableMethodTraits<ModelessHtmlDialogDelegate>::ReleaseCallee(
-    ModelessHtmlDialogDelegate* remover) {
-}
+template <>
+struct RunnableMethodTraits<ModelessHtmlDialogDelegate> {
+  void RetainCallee(ModelessHtmlDialogDelegate*) {}
+  void ReleaseCallee(ModelessHtmlDialogDelegate*) {}
+};
 
 namespace {
 
 //
 // Generic functions
 //
 
 void STDCALL CPB_SetKeepProcessAlive(CPID id, CPBool keep_alive) {
   // This is a no-op in the main browser process
 }
@@ skipping 432 matching lines @@
 void CPHandleCommand(int command, CPCommandInterface* data,
                      CPBrowsingContext context) {
   // Sadly if we try and pass context through, we seem to break cl's little
   // brain trying to compile the Tuple3 ctor. This cast works.
   int32 context_as_int32 = static_cast<int32>(context);
   // Plugins can only be accessed on the IO thread.
   g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE,
       NewRunnableFunction(PluginCommandHandler::HandleCommand,
                           command, data, context_as_int32));
 }