Template methods on Timer classes instead of the classes themselves.

chrome/test/base/tracing.cc

 // 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.
 
 #include "chrome/test/base/tracing.h"
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 133 matching lines @@
     }
   }
 
   void Timeout() {
     DCHECK(is_waiting_on_watch_);
     message_loop_runner_->Quit();
   }
 
   scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
 
-  base::OneShotTimer<InProcessTraceController> timer_;
+  base::OneShotTimer timer_;
 
   bool is_waiting_on_watch_;
   int watch_notification_count_;
 
   DISALLOW_COPY_AND_ASSIGN(InProcessTraceController);
 };
 
 }  // namespace
 
 namespace tracing {
@@ skipping 14 matching lines @@
 bool WaitForWatchEvent(base::TimeDelta timeout) {
   return InProcessTraceController::GetInstance()->WaitForWatchEvent(timeout);
 }
 
 bool EndTracing(std::string* json_trace_output) {
   return InProcessTraceController::GetInstance()->EndTracing(json_trace_output);
 }
 
 }  // namespace tracing