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

Unified Diff: chrome/browser/chromeos/login/existing_user_controller_browsertest.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/chromeos/login/existing_user_controller_browsertest.cc
diff --git a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
index 0402be786024a2923aefc8127f0e69428d3b1d98..61920729e47c88f5821746ee9d883a5b7cf112cd 100644
--- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
@@ -192,7 +192,7 @@ class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest {
}
// ExistingUserController private member accessors.
- base::OneShotTimer<ExistingUserController>* auto_login_timer() {
+ base::OneShotTimer* auto_login_timer() {
return existing_user_controller()->auto_login_timer_.get();
}
@@ -559,7 +559,7 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
// Wait for the timer to fire.
base::RunLoop runner;
- base::OneShotTimer<base::RunLoop> timer;
+ base::OneShotTimer timer;
timer.Start(FROM_HERE,
base::TimeDelta::FromMilliseconds(kAutoLoginShortDelay + 1),
runner.QuitClosure());

Powered by Google App Engine
This is Rietveld 408576698