Reverting 27389.

chrome/browser/gears_integration.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/browser/gears_integration.h"
 
 #include "base/gfx/png_encoder.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
@@ skipping 207 matching lines @@
   std::string url_;
   std::string description_;
   std::string icon_urls_[NUM_GEARS_ICONS];
   std::string orig_name_;
   scoped_ptr<GearsCreateShortcutCallback> callback_;
   MessageLoop* calling_loop_;
 };
 
 // Allows InvokeLater without adding refcounting.  The object is only deleted
 // when its last InvokeLater is run anyway.
-template<>
-void RunnableMethodTraits<CreateShortcutCommand>::RetainCallee(
-    CreateShortcutCommand* remover) {
-}
-template<>
-void RunnableMethodTraits<CreateShortcutCommand>::ReleaseCallee(
-    CreateShortcutCommand* remover) {
-}
+template <>
+struct RunnableMethodTraits<CreateShortcutCommand> {
+  void RetainCallee(CreateShortcutCommand*) {}
+  void ReleaseCallee(CreateShortcutCommand*) {}
+};
 
 void GearsCreateShortcut(
     const webkit_glue::WebApplicationInfo& app_info,
     const std::wstring& fallback_name,
     const GURL& fallback_url,
     const SkBitmap& fallback_icon,
     GearsCreateShortcutCallback* callback) {
   std::wstring name =
       !app_info.title.empty() ? app_info.title : fallback_name;
   std::string orig_name_utf8 = WideToUTF8(name);
@@ skipping 46 matching lines @@
     CPB_Free(shortcut_list_.shortcuts);
   }
 
   GearsShortcutList shortcut_list_;
   scoped_ptr<GearsQueryShortcutsCallback> callback_;
   MessageLoop* calling_loop_;
 };
 
 // Allows InvokeLater without adding refcounting.  The object is only deleted
 // when its last InvokeLater is run anyway.
-template<>
-void RunnableMethodTraits<QueryShortcutsCommand>::RetainCallee(
-    QueryShortcutsCommand* remover) {
-}
-template<>
-void RunnableMethodTraits<QueryShortcutsCommand>::ReleaseCallee(
-    QueryShortcutsCommand* remover) {
-}
+template <>
+struct RunnableMethodTraits<QueryShortcutsCommand> {
+  void RetainCallee(QueryShortcutsCommand*) {}
+  void ReleaseCallee(QueryShortcutsCommand*) {}
+};
 
 void GearsQueryShortcuts(GearsQueryShortcutsCallback* callback) {
   CPHandleCommand(GEARSPLUGINCOMMAND_GET_SHORTCUT_LIST,
       new QueryShortcutsCommand(callback),
       NULL);
 }