Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5415)

Unified Diff: chrome/browser/sync/glue/browser_thread_model_worker_unittest.cc

Issue 1355063004: Template methods on Timer classes instead of the classes themselves. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: timer: fixcaller Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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_;

Powered by Google App Engine
This is Rietveld 408576698