| Index: chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc
|
| diff --git a/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc b/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc
|
| index 1b165ea8337ba12f64283a4d0058f4048c4ef190..9d6891ca63e4fd2e0c54978663c191d0602777d6 100644
|
| --- a/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc
|
| +++ b/chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc
|
| @@ -18,7 +18,6 @@
|
| #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;
|
| @@ -37,7 +36,7 @@ class SyncBrowserThreadModelWorkerTest : public testing::Test {
|
|
|
| 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_;
|
| }
|
| @@ -89,7 +88,7 @@ class SyncBrowserThreadModelWorkerTest : public testing::Test {
|
| private:
|
| bool did_do_work_;
|
| scoped_refptr<BrowserThreadModelWorker> worker_;
|
| - OneShotTimer<SyncBrowserThreadModelWorkerTest> timer_;
|
| + base::OneShotTimer timer_;
|
|
|
| content::TestBrowserThreadBundle thread_bundle_;
|
|
|
|
|