Template methods on Timer classes instead of the classes themselves.

chrome/browser/android/feedback/connectivity_checker.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 "chrome/browser/android/feedback/connectivity_checker.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 82 matching lines @@
   // Holds the Java object which will get the callback with the result.
   base::android::ScopedJavaGlobalRef<jobject> java_callback_;
 
   // The URLFetcher that executes the connectivity check.
   scoped_ptr<net::URLFetcher> url_fetcher_;
 
   // Whether |this| is already being destroyed, at which point the callback
   // has already happened, and no further action should be taken.
   bool is_being_destroyed_;
 
-  scoped_ptr<base::OneShotTimer<ConnectivityChecker>> expiration_timer_;
+  scoped_ptr<base::OneShotTimer> expiration_timer_;
 };
 
 void ConnectivityChecker::OnURLFetchComplete(const net::URLFetcher* source) {
   if (is_being_destroyed_)
     return;
   is_being_destroyed_ = true;
 
   DCHECK_EQ(url_fetcher_.get(), source);
   net::URLRequestStatus status = source->GetStatus();
   int response_code = source->GetResponseCode();
@@ skipping 26 matching lines @@
       net::URLFetcher::Create(url_, net::URLFetcher::GET, this).Pass();
   url_fetcher_->SetRequestContext(request_context_);
   url_fetcher_->SetStopOnRedirect(true);
   url_fetcher_->SetAutomaticallyRetryOn5xx(false);
   url_fetcher_->SetAutomaticallyRetryOnNetworkChanges(0);
   url_fetcher_->SetLoadFlags(net::LOAD_BYPASS_CACHE | net::LOAD_DISABLE_CACHE |
                              net::LOAD_DO_NOT_SAVE_COOKIES |
                              net::LOAD_DO_NOT_SEND_COOKIES |
                              net::LOAD_DO_NOT_SEND_AUTH_DATA);
   url_fetcher_->Start();
-  expiration_timer_.reset(new base::OneShotTimer<ConnectivityChecker>());
+  expiration_timer_.reset(new base::OneShotTimer());
   expiration_timer_->Start(FROM_HERE, timeout_, this,
                            &ConnectivityChecker::OnTimeout);
 }
 
 void ConnectivityChecker::OnTimeout() {
   if (is_being_destroyed_)
     return;
   is_being_destroyed_ = true;
   url_fetcher_.reset();
   ExecuteCallback(java_callback_.obj(), CONNECTIVITY_CHECK_RESULT_TIMEOUT);
@@ skipping 32 matching lines @@
   GURL url(base::android::ConvertJavaStringToUTF8(env, j_url));
   return url.is_valid();
 }
 
 bool RegisterConnectivityChecker(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 }  // namespace chrome