Template methods on Timer classes instead of the classes themselves.

chrome/browser/sync/glue/browser_thread_model_worker_unittest.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 "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/test/test_timeouts.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread.h"
 #include "base/timer/timer.h"
 #include "components/sync_driver/glue/browser_thread_model_worker.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using base::OneShotTimer;
 using base::Thread;
 using base::TimeDelta;
 using content::BrowserThread;
 
 namespace browser_sync {
 
 namespace {
 
 class SyncBrowserThreadModelWorkerTest : public testing::Test {
  public:
   SyncBrowserThreadModelWorkerTest() :
       did_do_work_(false),
       thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP |
                      content::TestBrowserThreadBundle::REAL_DB_THREAD),
       weak_factory_(this) {}
 
   bool did_do_work() { return did_do_work_; }
   BrowserThreadModelWorker* worker() { return worker_.get(); }
-  OneShotTimer<SyncBrowserThreadModelWorkerTest>* timer() { return &timer_; }
+  base::OneShotTimer* timer() { return &timer_; }
   base::WeakPtrFactory<SyncBrowserThreadModelWorkerTest>* factory() {
     return &weak_factory_;
   }
 
   // Schedule DoWork to be executed on the DB thread and have the test fail if
   // DoWork hasn't executed within action_timeout().
   void ScheduleWork() {
    // We wait until the callback is done. So it is safe to use unretained.
     syncer::WorkCallback c =
         base::Bind(&SyncBrowserThreadModelWorkerTest::DoWork,
@@ skipping 31 matching lines @@
         syncer::GROUP_DB, NULL);
   }
 
   virtual void Teardown() {
     worker_ = NULL;
   }
 
  private:
   bool did_do_work_;
   scoped_refptr<BrowserThreadModelWorker> worker_;
-  OneShotTimer<SyncBrowserThreadModelWorkerTest> timer_;
+  base::OneShotTimer timer_;
 
   content::TestBrowserThreadBundle thread_bundle_;
 
   base::WeakPtrFactory<SyncBrowserThreadModelWorkerTest> weak_factory_;
 };
 
 TEST_F(SyncBrowserThreadModelWorkerTest, DoesWorkOnDatabaseThread) {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&SyncBrowserThreadModelWorkerTest::ScheduleWork,
                             factory()->GetWeakPtr()));
   base::MessageLoop::current()->Run();
   EXPECT_TRUE(did_do_work());
 }
 
 }  // namespace
 
 }  // namespace browser_sync