Template methods on Timer classes instead of the classes themselves.

components/copresence/copresence_manager_impl.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/copresence/copresence_manager_impl.h"
 
 #include <map>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 32 matching lines @@
       return true;
   }
   return false;
 }
 
 
 // Public functions.
 
 CopresenceManagerImpl::CopresenceManagerImpl(CopresenceDelegate* delegate)
     : delegate_(delegate),
-      whispernet_init_callback_(base::Bind(
-          &CopresenceManagerImpl::WhispernetInitComplete,
-          // This callback gets cancelled when we are destroyed.
-          base::Unretained(this))),
+      whispernet_init_callback_(
+          base::Bind(&CopresenceManagerImpl::WhispernetInitComplete,
+                     // This callback gets cancelled when we are destroyed.
+                     base::Unretained(this))),
       init_failed_(false),
       state_(new CopresenceStateImpl),
       directive_handler_(new DirectiveHandlerImpl(
           // The directive handler and its descendants
           // will be destructed before the CopresenceState instance.
           base::Bind(&CopresenceStateImpl::UpdateDirectives,
                      base::Unretained(state_.get())))),
-      poll_timer_(new base::RepeatingTimer<CopresenceManagerImpl>),
-      audio_check_timer_(new base::RepeatingTimer<CopresenceManagerImpl>),
+      poll_timer_(new base::RepeatingTimer),
+      audio_check_timer_(new base::RepeatingTimer),
       queued_messages_by_token_(
           base::TimeDelta::FromSeconds(kQueuedMessageTimeout),
           kMaxQueuedMessages) {
   DCHECK(delegate_);
   DCHECK(delegate_->GetWhispernetClient());
   // TODO(ckehoe): Handle whispernet initialization in the whispernet component.
   delegate_->GetWhispernetClient()->Initialize(
       whispernet_init_callback_.callback());
 
   MessagesCallback messages_callback = base::Bind(
@@ skipping 184 matching lines @@
   for (const auto& map_entry : messages_by_subscription) {
     // TODO(ckehoe): Once we have the app ID from the server, we need to pass
     // it in here and get rid of the app id registry from the main API class.
     const std::string& subscription = map_entry.first;
     const std::vector<Message>& messages = map_entry.second;
     delegate_->HandleMessages(std::string(), subscription, messages);
   }
 }
 
 }  // namespace copresence