Template methods on Timer classes instead of the classes themselves.

components/sync_driver/model_association_manager.cc

 // Copyright 2014 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 "components/sync_driver/model_association_manager.h"
 
 #include <algorithm>
 #include <functional>
 
 #include "base/logging.h"
@@ skipping 401 matching lines @@
 
   // Need to reset state before invoking delegate in order to avoid re-entrancy
   // issues (delegate may trigger a reconfiguration).
   associating_types_.Clear();
   requested_types_.Clear();
   state_ = new_state;
 
   delegate_->OnModelAssociationDone(result);
 }
 
-base::OneShotTimer<ModelAssociationManager>*
-    ModelAssociationManager::GetTimerForTesting() {
+base::OneShotTimer* ModelAssociationManager::GetTimerForTesting() {
   return &timer_;
 }
 
 }  // namespace sync_driver