Template methods on Timer classes instead of the classes themselves.

components/proximity_auth/device_to_device_authenticator.cc

 // Copyright 2015 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/proximity_auth/device_to_device_authenticator.h"
 
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "components/proximity_auth/connection.h"
 #include "components/proximity_auth/cryptauth/secure_message_delegate.h"
@@ skipping 71 matching lines @@
   // Create the [Hello] message to send to the remote device.
   state_ = State::SENDING_HELLO;
   DeviceToDeviceInitiatorOperations::CreateHelloMessage(
       public_key, connection_->remote_device().persistent_symmetric_key,
       secure_message_delegate_.get(),
       base::Bind(&DeviceToDeviceAuthenticator::OnHelloMessageCreated,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 scoped_ptr<base::Timer> DeviceToDeviceAuthenticator::CreateTimer() {
-  return make_scoped_ptr(new base::OneShotTimer<DeviceToDeviceAuthenticator>());
+  return make_scoped_ptr(new base::OneShotTimer());
 }
 
 void DeviceToDeviceAuthenticator::OnHelloMessageCreated(
     const std::string& message) {
   DCHECK(state_ == State::SENDING_HELLO);
   if (message.empty()) {
     Fail("Failed to create [Hello]");
     return;
   }
 
@@ skipping 124 matching lines @@
       Succeed();
     else
       Fail("Failed to send [Initiator Auth]");
   } else if (!success && state_ == State::SENT_HELLO) {
     DCHECK(message.payload() == hello_message_);
     Fail("Failed to send [Hello]");
   }
 }
 
 }  // namespace proximity_auth