Implement auto-login for ARC kiosk.

chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc

Index: chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc
diff --git a/chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc b/chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc
index 40346d4c15e938088b4802b47354283c15c418d2..50274ca3d13daed66d262e6c984f86eb9e2dbca7 100644
--- a/chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc
@@ -7,6 +7,7 @@
 
 #include "base/message_loop/message_loop.h"
 #include "base/values.h"
+#include "chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/ui/mock_login_display.h"
 #include "chrome/browser/chromeos/login/ui/mock_login_display_host.h"
@@ -49,6 +50,7 @@ class ExistingUserControllerAutoLoginTest : public ::testing::Test {
   void SetUp() override {
     mock_login_display_host_.reset(new MockLoginDisplayHost);
     mock_login_display_ = new MockLoginDisplay();
+    arc_kiosk_app_manager_.reset(new ArcKioskAppManager());
 
     EXPECT_CALL(*mock_login_display_host_.get(), CreateLoginDisplay(_))
         .Times(1)
@@ -111,10 +113,10 @@ class ExistingUserControllerAutoLoginTest : public ::testing::Test {
   }
 
   int auto_login_delay() const {
-    return existing_user_controller()->public_session_auto_login_delay_;
+    return existing_user_controller()->auto_login_delay_;
   }
   void set_auto_login_delay(int delay) {
-    existing_user_controller()->public_session_auto_login_delay_ = delay;
+    existing_user_controller()->auto_login_delay_ = delay;
   }
 
   bool is_login_in_progress() const {
@@ -125,7 +127,7 @@ class ExistingUserControllerAutoLoginTest : public ::testing::Test {
   }
 
   void ConfigureAutoLogin() {
-    existing_user_controller()->ConfigurePublicSessionAutoLogin();
+    existing_user_controller()->ConfigureAutoLogin();
   }
 
   const std::string auto_login_user_id_ =
@@ -151,6 +153,7 @@ class ExistingUserControllerAutoLoginTest : public ::testing::Test {
   ScopedTestCrosSettings test_cros_settings_;
   MockUserManager* mock_user_manager_;
   ScopedUserManagerEnabler scoped_user_manager_;
+  std::unique_ptr<ArcKioskAppManager> arc_kiosk_app_manager_;
 
   // |existing_user_controller_| must be destroyed before
   // |device_settings_test_helper_|.
@@ -161,24 +164,24 @@ TEST_F(ExistingUserControllerAutoLoginTest, StartAutoLoginTimer) {
   // Timer shouldn't start until signin screen is ready.
   set_auto_login_account_id(auto_login_account_id_);
   set_auto_login_delay(kAutoLoginDelay2);
-  existing_user_controller()->StartPublicSessionAutoLoginTimer();
+  existing_user_controller()->StartAutoLoginTimer();
   EXPECT_FALSE(auto_login_timer());
 
   // Timer shouldn't start if the policy isn't set.
   set_auto_login_account_id(EmptyAccountId());
   existing_user_controller()->OnSigninScreenReady();
-  existing_user_controller()->StartPublicSessionAutoLoginTimer();
+  existing_user_controller()->StartAutoLoginTimer();
   EXPECT_FALSE(auto_login_timer());
 
   // Timer shouldn't fire in the middle of a login attempt.
   set_auto_login_account_id(auto_login_account_id_);
   set_is_login_in_progress(true);
-  existing_user_controller()->StartPublicSessionAutoLoginTimer();
+  existing_user_controller()->StartAutoLoginTimer();
   EXPECT_FALSE(auto_login_timer());
 
   // Otherwise start.
   set_is_login_in_progress(false);
-  existing_user_controller()->StartPublicSessionAutoLoginTimer();
+  existing_user_controller()->StartAutoLoginTimer();
   ASSERT_TRUE(auto_login_timer());
   EXPECT_TRUE(auto_login_timer()->IsRunning());
   EXPECT_EQ(auto_login_timer()->GetCurrentDelay().InMilliseconds(),
@@ -190,11 +193,11 @@ TEST_F(ExistingUserControllerAutoLoginTest, StopAutoLoginTimer) {
   set_auto_login_account_id(auto_login_account_id_);
   set_auto_login_delay(kAutoLoginDelay2);
 
-  existing_user_controller()->StartPublicSessionAutoLoginTimer();
+  existing_user_controller()->StartAutoLoginTimer();
   ASSERT_TRUE(auto_login_timer());
   EXPECT_TRUE(auto_login_timer()->IsRunning());
 
-  existing_user_controller()->StopPublicSessionAutoLoginTimer();
+  existing_user_controller()->StopAutoLoginTimer();
   ASSERT_TRUE(auto_login_timer());
   EXPECT_FALSE(auto_login_timer()->IsRunning());
 }
@@ -207,12 +210,12 @@ TEST_F(ExistingUserControllerAutoLoginTest, ResetAutoLoginTimer) {
   EXPECT_FALSE(auto_login_timer());
 
   // When the timer isn't running, nothing should happen.
-  existing_user_controller()->ResetPublicSessionAutoLoginTimer();
+  existing_user_controller()->ResetAutoLoginTimer();
   EXPECT_FALSE(auto_login_timer());
 
   // Start the timer.
   set_auto_login_delay(kAutoLoginDelay2);
-  existing_user_controller()->StartPublicSessionAutoLoginTimer();
+  existing_user_controller()->StartAutoLoginTimer();
   ASSERT_TRUE(auto_login_timer());
   EXPECT_TRUE(auto_login_timer()->IsRunning());
   EXPECT_EQ(auto_login_timer()->GetCurrentDelay().InMilliseconds(),
@@ -221,7 +224,7 @@ TEST_F(ExistingUserControllerAutoLoginTest, ResetAutoLoginTimer) {
   // User activity should restart the timer, so check to see that the
   // timer delay was modified.
   set_auto_login_delay(kAutoLoginDelay1);
-  existing_user_controller()->ResetPublicSessionAutoLoginTimer();
+  existing_user_controller()->ResetAutoLoginTimer();
   ASSERT_TRUE(auto_login_timer());
   EXPECT_TRUE(auto_login_timer()->IsRunning());
   EXPECT_EQ(auto_login_timer()->GetCurrentDelay().InMilliseconds(),