Template methods on Timer classes instead of the classes themselves.

chrome/browser/captive_portal/captive_portal_service.h

 // Copyright (c) 2012 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 CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_H_
 #define CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_member.h"
@@ skipping 172 matching lines @@
   scoped_ptr<net::BackoffEntry> backoff_entry_;
 
   // URL that returns a 204 response code when connected to the Internet.
   GURL test_url_;
 
   // The pref member for whether navigation errors should be resolved with a web
   // service.  Actually called "alternate_error_pages", since it's also used for
   // the Link Doctor.
   BooleanPrefMember resolve_errors_with_web_service_;
 
-  base::OneShotTimer<CaptivePortalService> check_captive_portal_timer_;
+  base::OneShotTimer check_captive_portal_timer_;
 
   static TestingState testing_state_;
 
   // Test tick clock used by unit tests.
   base::TickClock* tick_clock_for_testing_;  // Not owned.
 
   DISALLOW_COPY_AND_ASSIGN(CaptivePortalService);
 };
 
 #endif  // CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_SERVICE_H_