Add support in TestMockTimeTaskRunner for vending out mock Time and mock Clocks.

ash/system/chromeos/session/logout_confirmation_controller_unittest.cc

Index: ash/system/chromeos/session/logout_confirmation_controller_unittest.cc
diff --git a/ash/system/chromeos/session/logout_confirmation_controller_unittest.cc b/ash/system/chromeos/session/logout_confirmation_controller_unittest.cc
index fa30c9fd05c7ad457e00096280b01efe2854a7f3..cd0a4b4eaefbfbdfdea295c7acbb7b62c7f67557 100644
--- a/ash/system/chromeos/session/logout_confirmation_controller_unittest.cc
+++ b/ash/system/chromeos/session/logout_confirmation_controller_unittest.cc
@@ -9,6 +9,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/test/test_mock_time_task_runner.h"
 #include "base/thread_task_runner_handle.h"
+#include "base/time/tick_clock.h"

[bartfab (slow), 2015/02/12 09:50:55]

Nit: No need for this include. The type is never dereferenced.

[engedy, 2015/02/12 11:27:03]

It is needed for passing the scoped_ptr returned by the task runner into
SetClockForTesting().

[bartfab (slow), 2015/02/12 12:36:07]

You do not need to define the types you pass around via a pointer.

[engedy, 2015/02/13 11:08:04]

Note that this is not a raw pointer, but a scoped_ptr.

I have not looked into the implementation of scoped_ptr<T> too deeply, but I
believe the definition of T is needed so that the code for ~scoped_ptr<T>(),
necessitated by the destruction of the temporary on line 41, and containing an
invocation to ~T(), can be generated.

(I tried, just to be sure, and it won't compile without the include.)

[bartfab (slow), 2015/02/16 13:40:34]

Aye, your analysis is correct. I had missed the fact that this is a scoped_ptr.

 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace ash {
@@ -50,7 +51,7 @@ void LogoutConfirmationControllerTest::LogOut() {
 // Verifies that the user is logged out immediately if logout confirmation with
 // a zero-length countdown is requested.
 TEST_F(LogoutConfirmationControllerTest, ZeroDuration) {
-  controller_.ConfirmLogout(runner_->GetCurrentMockTime());
+  controller_.ConfirmLogout(runner_->NowTicks());
   EXPECT_FALSE(log_out_called_);
   runner_->FastForwardBy(base::TimeDelta());
   EXPECT_TRUE(log_out_called_);
@@ -58,8 +59,8 @@ TEST_F(LogoutConfirmationControllerTest, ZeroDuration) {
 
 // Verifies that the user is logged out when the countdown expires.
 TEST_F(LogoutConfirmationControllerTest, DurationExpired) {
-  controller_.ConfirmLogout(
-      runner_->GetCurrentMockTime() + base::TimeDelta::FromSeconds(10));
+  controller_.ConfirmLogout(runner_->NowTicks() +
+                            base::TimeDelta::FromSeconds(10));
   EXPECT_FALSE(log_out_called_);
   runner_->FastForwardBy(base::TimeDelta::FromSeconds(9));
   EXPECT_FALSE(log_out_called_);
@@ -71,13 +72,13 @@ TEST_F(LogoutConfirmationControllerTest, DurationExpired) {
 // request's countdown ends before the original request's, the user is logged
 // out when the new countdown expires.
 TEST_F(LogoutConfirmationControllerTest, DurationShortened) {
-  controller_.ConfirmLogout(
-      runner_->GetCurrentMockTime() + base::TimeDelta::FromSeconds(30));
+  controller_.ConfirmLogout(runner_->NowTicks() +
+                            base::TimeDelta::FromSeconds(30));
   EXPECT_FALSE(log_out_called_);
   runner_->FastForwardBy(base::TimeDelta::FromSeconds(9));
   EXPECT_FALSE(log_out_called_);
-  controller_.ConfirmLogout(
-      runner_->GetCurrentMockTime() + base::TimeDelta::FromSeconds(10));
+  controller_.ConfirmLogout(runner_->NowTicks() +
+                            base::TimeDelta::FromSeconds(10));
   runner_->FastForwardBy(base::TimeDelta::FromSeconds(9));
   EXPECT_FALSE(log_out_called_);
   runner_->FastForwardBy(base::TimeDelta::FromSeconds(2));
@@ -88,13 +89,13 @@ TEST_F(LogoutConfirmationControllerTest, DurationShortened) {
 // request's countdown ends after the original request's, the user is logged
 // out when the original countdown expires.
 TEST_F(LogoutConfirmationControllerTest, DurationExtended) {
-  controller_.ConfirmLogout(
-      runner_->GetCurrentMockTime() + base::TimeDelta::FromSeconds(10));
+  controller_.ConfirmLogout(runner_->NowTicks() +
+                            base::TimeDelta::FromSeconds(10));
   EXPECT_FALSE(log_out_called_);
   runner_->FastForwardBy(base::TimeDelta::FromSeconds(9));
   EXPECT_FALSE(log_out_called_);
-  controller_.ConfirmLogout(
-      runner_->GetCurrentMockTime() + base::TimeDelta::FromSeconds(10));
+  controller_.ConfirmLogout(runner_->NowTicks() +
+                            base::TimeDelta::FromSeconds(10));
   runner_->FastForwardBy(base::TimeDelta::FromSeconds(2));
   EXPECT_TRUE(log_out_called_);
 }
@@ -102,8 +103,8 @@ TEST_F(LogoutConfirmationControllerTest, DurationExtended) {
 // Verifies that when the screen is locked while the countdown is running, the
 // user is not logged out, even when the original countdown expires.
 TEST_F(LogoutConfirmationControllerTest, Lock) {
-  controller_.ConfirmLogout(
-      runner_->GetCurrentMockTime() + base::TimeDelta::FromSeconds(10));
+  controller_.ConfirmLogout(runner_->NowTicks() +
+                            base::TimeDelta::FromSeconds(10));
   EXPECT_FALSE(log_out_called_);
   controller_.OnLockStateChanged(true);
   runner_->FastForwardUntilNoTasksRemain();
@@ -113,8 +114,8 @@ TEST_F(LogoutConfirmationControllerTest, Lock) {
 // Verifies that when the user confirms the logout request, the user is logged
 // out immediately.
 TEST_F(LogoutConfirmationControllerTest, UserAccepted) {
-  controller_.ConfirmLogout(
-      runner_->GetCurrentMockTime() + base::TimeDelta::FromSeconds(10));
+  controller_.ConfirmLogout(runner_->NowTicks() +
+                            base::TimeDelta::FromSeconds(10));
   EXPECT_FALSE(log_out_called_);
   controller_.OnLogoutConfirmed();
   EXPECT_TRUE(log_out_called_);
@@ -123,8 +124,8 @@ TEST_F(LogoutConfirmationControllerTest, UserAccepted) {
 // Verifies that when the user denies the logout request, the user is not logged
 // out, even when the original countdown expires.
 TEST_F(LogoutConfirmationControllerTest, UserDenied) {
-  controller_.ConfirmLogout(
-      runner_->GetCurrentMockTime() + base::TimeDelta::FromSeconds(10));
+  controller_.ConfirmLogout(runner_->NowTicks() +
+                            base::TimeDelta::FromSeconds(10));
   EXPECT_FALSE(log_out_called_);
   controller_.OnDialogClosed();
   runner_->FastForwardUntilNoTasksRemain();
@@ -135,15 +136,15 @@ TEST_F(LogoutConfirmationControllerTest, UserDenied) {
 // request is handled correctly and the user is logged out when the countdown
 // expires.
 TEST_F(LogoutConfirmationControllerTest, DurationExpiredAfterDeniedRequest) {
-  controller_.ConfirmLogout(
-      runner_->GetCurrentMockTime() + base::TimeDelta::FromSeconds(10));
+  controller_.ConfirmLogout(runner_->NowTicks() +
+                            base::TimeDelta::FromSeconds(10));
   EXPECT_FALSE(log_out_called_);
   controller_.OnDialogClosed();
   runner_->FastForwardUntilNoTasksRemain();
   EXPECT_FALSE(log_out_called_);
 
-  controller_.ConfirmLogout(
-      runner_->GetCurrentMockTime() + base::TimeDelta::FromSeconds(10));
+  controller_.ConfirmLogout(runner_->NowTicks() +
+                            base::TimeDelta::FromSeconds(10));
   EXPECT_FALSE(log_out_called_);
   runner_->FastForwardBy(base::TimeDelta::FromSeconds(9));
   EXPECT_FALSE(log_out_called_);