Template methods on Timer classes instead of the classes themselves.

ui/views/controls/menu/menu_controller.h

Index: ui/views/controls/menu/menu_controller.h
diff --git a/ui/views/controls/menu/menu_controller.h b/ui/views/controls/menu/menu_controller.h
index b1db03d63820d6be5023bee0107af0c22ca2ed8c..db6b426e6c5b5444962d45b686f79654993a2950 100644
--- a/ui/views/controls/menu/menu_controller.h
+++ b/ui/views/controls/menu/menu_controller.h
@@ -567,13 +567,13 @@ class VIEWS_EXPORT MenuController : public WidgetObserver {
 
   // As the mouse moves around submenus are not opened immediately. Instead
   // they open after this timer fires.
-  base::OneShotTimer<MenuController> show_timer_;
+  base::OneShotTimer show_timer_;
 
   // Used to invoke CancelAll(). This is used during drag and drop to hide the
   // menu after the mouse moves out of the of the menu. This is necessitated by
   // the lack of an ability to detect when the drag has completed from the drop
   // side.
-  base::OneShotTimer<MenuController> cancel_all_timer_;
+  base::OneShotTimer cancel_all_timer_;
 
   // Drop target.
   MenuItemView* drop_target_;