Template methods on Timer classes instead of the classes themselves.

components/sync_driver/model_association_manager.cc

Index: components/sync_driver/model_association_manager.cc
diff --git a/components/sync_driver/model_association_manager.cc b/components/sync_driver/model_association_manager.cc
index 7602385a1071eb79302697fc74d8853b9030a8ee..b7320063273bd6bf8e72738f0ffdf3a0b9ba5a95 100644
--- a/components/sync_driver/model_association_manager.cc
+++ b/components/sync_driver/model_association_manager.cc
@@ -419,8 +419,7 @@ void ModelAssociationManager::ModelAssociationDone(State new_state) {
   delegate_->OnModelAssociationDone(result);
 }
 
-base::OneShotTimer<ModelAssociationManager>*
-    ModelAssociationManager::GetTimerForTesting() {
+base::OneShotTimer* ModelAssociationManager::GetTimerForTesting() {
   return &timer_;
 }