Template methods on Timer classes instead of the classes themselves.

components/signin/core/browser/gaia_cookie_manager_service.h

 // 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.
 
 #ifndef COMPONENTS_SIGNIN_CORE_BROWSER_GAIA_COOKIE_MANAGER_SERVICE_H
 #define COMPONENTS_SIGNIN_CORE_BROWSER_GAIA_COOKIE_MANAGER_SERVICE_H
 
 #include <deque>
 
 #include "base/observer_list.h"
@@ skipping 123 matching lines @@
     void OnURLFetchComplete(const net::URLFetcher* source) override;
 
     // Any fetches still ongoing after this call are considered timed out.
     void Timeout();
 
     void CleanupTransientState();
 
     void GetCheckConnectionInfoCompleted(bool succeeded);
 
     GaiaCookieManagerService* helper_;
-    base::OneShotTimer<ExternalCcResultFetcher> timer_;
+    base::OneShotTimer timer_;
     URLToTokenAndFetcher fetchers_;
     ResultMap results_;
     base::Time m_external_cc_result_start_time_;
 
-    base::OneShotTimer<ExternalCcResultFetcher> gaia_auth_fetcher_timer_;
+    base::OneShotTimer gaia_auth_fetcher_timer_;
 
     DISALLOW_COPY_AND_ASSIGN(ExternalCcResultFetcher);
   };
 
   GaiaCookieManagerService(OAuth2TokenService* token_service,
                            const std::string& source,
                            SigninClient* signin_client);
   ~GaiaCookieManagerService() override;
 
   void Init();
@@ skipping 79 matching lines @@
 
   OAuth2TokenService* token_service_;
   SigninClient* signin_client_;
   scoped_ptr<GaiaAuthFetcher> gaia_auth_fetcher_;
   scoped_ptr<UbertokenFetcher> uber_token_fetcher_;
   ExternalCcResultFetcher external_cc_result_fetcher_;
 
   // If the GaiaAuthFetcher or URLFetcher fails, retry with exponential backoff
   // and network delay.
   net::BackoffEntry fetcher_backoff_;
-  // We can safely depend on the SigninClient here because there is an explicit
-  // dependency, as noted in the GaiaCookieManagerServiceFactory.
-  base::OneShotTimer<SigninClient> fetcher_timer_;
+  base::OneShotTimer fetcher_timer_;
   int fetcher_retries_;
 
   // The last fetched ubertoken, for use in MergeSession retries.
   std::string uber_token_;
 
   // The access token that can be used to prime the UberToken fetch.
   std::string access_token_;
 
   // Subscription to be called whenever the GAIA cookies change.
   scoped_ptr<SigninClient::CookieChangedSubscription>
@@ skipping 15 matching lines @@
   bool external_cc_result_fetched_;
 
   std::vector<gaia::ListedAccount> listed_accounts_;
 
   bool list_accounts_fetched_once_;
 
   DISALLOW_COPY_AND_ASSIGN(GaiaCookieManagerService);
 };
 
 #endif  // COMPONENTS_SIGNIN_CORE_BROWSER_GAIA_COOKIE_MANAGER_SERVICE_H