Translate device-local account IDs to user IDs

chrome/browser/chromeos/login/existing_user_controller_browsertest.cc

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 93e9767c47def00c28c4305830d883baef4b7a54..58c3c821a984c5a2b6e13c8b295130589c39aa21 100644
--- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
@@ -10,14 +10,12 @@
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/location.h"
-#include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
 #include "chrome/browser/chromeos/cros/cros_mock.h"
 #include "chrome/browser/chromeos/cros/mock_network_library.h"
 #include "chrome/browser/chromeos/login/authenticator.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/helper.h"
-#include "chrome/browser/chromeos/login/login_status_consumer.h"
 #include "chrome/browser/chromeos/login/mock_authenticator.h"
 #include "chrome/browser/chromeos/login/mock_login_display.h"
 #include "chrome/browser/chromeos/login/mock_login_display_host.h"
@@ -26,6 +24,7 @@
 #include "chrome/browser/chromeos/login/mock_user_manager.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
+#include "chrome/browser/chromeos/policy/device_local_account.h"
 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
@@ -73,24 +72,14 @@ const char kUsername[] = "test_user@gmail.com";
 const char kNewUsername[] = "test_new_user@gmail.com";
 const char kPassword[] = "test_password";
 
-const char kAutoLoginUsername[] = "public_session_user@localhost";
+const char kPublicSessionAccountId[] = "public_session_user@localhost";
 const int kAutoLoginNoDelay = 0;
 const int kAutoLoginShortDelay = 1;
 const int kAutoLoginLongDelay = 10000;
 
-scoped_refptr<Authenticator> CreateAuthenticator(
-    LoginStatusConsumer* consumer) {
-  return new MockAuthenticator(consumer, kUsername, kPassword);
-}
-
-scoped_refptr<Authenticator> CreateAuthenticatorNewUser(
-    LoginStatusConsumer* consumer) {
-  return new MockAuthenticator(consumer, kNewUsername, kPassword);
-}
 
-scoped_refptr<Authenticator> CreateAuthenticatorForPublicSession(
-    LoginStatusConsumer* consumer) {
-  return new MockAuthenticator(consumer, kAutoLoginUsername, "");
+ACTION_P2(CreateAuthenticator, username, password) {
+  return new MockAuthenticator(arg0, username, password);
 }
 
 // Observes a specific notification type and quits the message loop once a
@@ -306,7 +295,7 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, ExistingUserLogin) {
       .Times(2);
   EXPECT_CALL(*mock_login_utils_, CreateAuthenticator(_))
       .Times(1)
-      .WillOnce(WithArg<0>(Invoke(CreateAuthenticator)));
+      .WillOnce(WithArg<0>(CreateAuthenticator(kUsername, kPassword)));
   EXPECT_CALL(*mock_login_utils_,
               PrepareProfile(UserContext(kUsername, kPassword, "", kUsername),
                              _, _, _, _))
@@ -372,7 +361,7 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest,
       .Times(1);
   EXPECT_CALL(*mock_login_utils_, CreateAuthenticator(_))
       .Times(1)
-      .WillOnce(WithArg<0>(Invoke(CreateAuthenticatorNewUser)));
+      .WillOnce(WithArg<0>(CreateAuthenticator(kNewUsername, kPassword)));
   EXPECT_CALL(*mock_login_utils_,
               PrepareProfile(UserContext(kNewUsername,
                                          kPassword,
@@ -416,25 +405,28 @@ MATCHER_P(HasDetails, expected, "") {
 class ExistingUserControllerPublicSessionTest
     : public ExistingUserControllerTest {
  protected:
-  ExistingUserControllerPublicSessionTest() {
+  ExistingUserControllerPublicSessionTest()
+      : public_session_user_id_(policy::GenerateDeviceLocalAccountUserId(
+            kPublicSessionAccountId,
+            policy::DeviceLocalAccount::TYPE_PUBLIC_SESSION)) {
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
     ExistingUserControllerTest::SetUpOnMainThread();
 
     // Wait for the public session user to be created.
-    if (!chromeos::UserManager::Get()->IsKnownUser(kAutoLoginUsername)) {
+    if (!chromeos::UserManager::Get()->IsKnownUser(public_session_user_id_)) {
       NotificationWatcher(
           chrome::NOTIFICATION_USER_LIST_CHANGED,
           base::Bind(&chromeos::UserManager::IsKnownUser,
                      base::Unretained(chromeos::UserManager::Get()),
-                     kAutoLoginUsername)).Run();
+                     public_session_user_id_)).Run();
     }
 
     // Wait for the device local account policy to be installed.
     policy::CloudPolicyStore* store = TestingBrowserProcess::GetGlobal()->
         browser_policy_connector()->GetDeviceLocalAccountPolicyService()->
-        GetBrokerForAccount(kAutoLoginUsername)->core()->store();
+        GetBrokerForUser(public_session_user_id_)->core()->store();
     if (!store->has_policy()) {
       policy::MockCloudPolicyStoreObserver observer;
 
@@ -455,21 +447,22 @@ class ExistingUserControllerPublicSessionTest
     em::ChromeDeviceSettingsProto& proto(device_policy()->payload());
     em::DeviceLocalAccountInfoProto* account =
         proto.mutable_device_local_accounts()->add_account();
-    account->set_account_id(kAutoLoginUsername);
+    account->set_account_id(kPublicSessionAccountId);
     account->set_type(
         em::DeviceLocalAccountInfoProto::ACCOUNT_TYPE_PUBLIC_SESSION);
     RefreshDevicePolicy();
 
     // Setup the device local account policy.
     policy::UserPolicyBuilder device_local_account_policy;
-    device_local_account_policy.policy_data().set_username(kAutoLoginUsername);
+    device_local_account_policy.policy_data().set_username(
+        kPublicSessionAccountId);
     device_local_account_policy.policy_data().set_policy_type(
         policy::dm_protocol::kChromePublicAccountPolicyType);
     device_local_account_policy.policy_data().set_settings_entity_id(
-        kAutoLoginUsername);
+        kPublicSessionAccountId);
     device_local_account_policy.Build();
     session_manager_client()->set_device_local_account_policy(
-        kAutoLoginUsername,
+        kPublicSessionAccountId,
         device_local_account_policy.GetBlob());
   }
 
@@ -490,14 +483,12 @@ class ExistingUserControllerPublicSessionTest
   }
 
   void ExpectSuccessfulLogin(const std::string& username,
-                             const std::string& password,
-                             scoped_refptr<Authenticator> create_authenticator(
-                                 LoginStatusConsumer* consumer)) {
+                             const std::string& password) {
     EXPECT_CALL(*mock_login_display_, SetUIEnabled(false))
         .Times(AnyNumber());
     EXPECT_CALL(*mock_login_utils_, CreateAuthenticator(_))
         .Times(1)
-        .WillOnce(WithArg<0>(Invoke(create_authenticator)));
+        .WillOnce(WithArg<0>(CreateAuthenticator(username, password)));
     EXPECT_CALL(*mock_login_utils_,
                 PrepareProfile(UserContext(username, password, "", username),
                                _, _, _, _))
@@ -584,6 +575,8 @@ class ExistingUserControllerPublicSessionTest
     existing_user_controller()->OnPublicSessionAutoLoginTimerFire();
   }
 
+  const std::string public_session_user_id_;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(ExistingUserControllerPublicSessionTest);
 };
@@ -596,8 +589,8 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
   EXPECT_FALSE(auto_login_timer());
 
   // Set the policy.
-  SetAutoLoginPolicy(kAutoLoginUsername, kAutoLoginLongDelay);
-  EXPECT_EQ(kAutoLoginUsername, auto_login_username());
+  SetAutoLoginPolicy(kPublicSessionAccountId, kAutoLoginLongDelay);
+  EXPECT_EQ(public_session_user_id_, auto_login_username());
   EXPECT_EQ(kAutoLoginLongDelay, auto_login_delay());
   ASSERT_TRUE(auto_login_timer());
   EXPECT_TRUE(auto_login_timer()->IsRunning());
@@ -613,22 +606,20 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
                        AutoLoginNoDelay) {
   // Set up mocks to check login success.
-  ExpectSuccessfulLogin(kAutoLoginUsername, "",
-                        CreateAuthenticatorForPublicSession);
+  ExpectSuccessfulLogin(public_session_user_id_, "");
   existing_user_controller()->OnSigninScreenReady();
 
   // Start auto-login and wait for login tasks to complete.
-  SetAutoLoginPolicy(kAutoLoginUsername, kAutoLoginNoDelay);
+  SetAutoLoginPolicy(kPublicSessionAccountId, kAutoLoginNoDelay);
   content::RunAllPendingInMessageLoop();
 }
 
 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
                        AutoLoginShortDelay) {
   // Set up mocks to check login success.
-  ExpectSuccessfulLogin(kAutoLoginUsername, "",
-                        CreateAuthenticatorForPublicSession);
+  ExpectSuccessfulLogin(public_session_user_id_, "");
   existing_user_controller()->OnSigninScreenReady();
-  SetAutoLoginPolicy(kAutoLoginUsername, kAutoLoginShortDelay);
+  SetAutoLoginPolicy(kPublicSessionAccountId, kAutoLoginShortDelay);
   ASSERT_TRUE(auto_login_timer());
   // Don't assert that timer is running: with the short delay sometimes
   // the trigger happens before the assert.  We've already tested that
@@ -649,10 +640,10 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
                        LoginStopsAutoLogin) {
   // Set up mocks to check login success.
-  ExpectSuccessfulLogin(kUsername, kPassword, CreateAuthenticator);
+  ExpectSuccessfulLogin(kUsername, kPassword);
 
   existing_user_controller()->OnSigninScreenReady();
-  SetAutoLoginPolicy(kAutoLoginUsername, kAutoLoginLongDelay);
+  SetAutoLoginPolicy(kPublicSessionAccountId, kAutoLoginLongDelay);
   ASSERT_TRUE(auto_login_timer());
 
   // Login and check that it stopped the timer.
@@ -675,12 +666,12 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
       .Times(1);
   EXPECT_CALL(*mock_login_utils_, CreateAuthenticator(_))
       .Times(1)
-      .WillOnce(WithArg<0>(Invoke(CreateAuthenticator)));
+      .WillOnce(WithArg<0>(CreateAuthenticator(kUsername, kPassword)));
   EXPECT_CALL(*mock_login_utils_, CompleteOffTheRecordLogin(_))
       .Times(1);
 
   existing_user_controller()->OnSigninScreenReady();
-  SetAutoLoginPolicy(kAutoLoginUsername, kAutoLoginLongDelay);
+  SetAutoLoginPolicy(kPublicSessionAccountId, kAutoLoginLongDelay);
   ASSERT_TRUE(auto_login_timer());
 
   // Login and check that it stopped the timer.
@@ -700,12 +691,12 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
                        CompleteLoginStopsAutoLogin) {
   // Set up mocks to check login success.
-  ExpectSuccessfulLogin(kUsername, kPassword, CreateAuthenticator);
+  ExpectSuccessfulLogin(kUsername, kPassword);
   EXPECT_CALL(*mock_login_display_host_, OnCompleteLogin())
       .Times(1);
 
   existing_user_controller()->OnSigninScreenReady();
-  SetAutoLoginPolicy(kAutoLoginUsername, kAutoLoginLongDelay);
+  SetAutoLoginPolicy(kPublicSessionAccountId, kAutoLoginLongDelay);
   ASSERT_TRUE(auto_login_timer());
 
   // Check that login completes and stops the timer.
@@ -725,14 +716,13 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
                        PublicSessionLoginStopsAutoLogin) {
   // Set up mocks to check login success.
-  ExpectSuccessfulLogin(kAutoLoginUsername, "",
-                        CreateAuthenticatorForPublicSession);
+  ExpectSuccessfulLogin(public_session_user_id_, "");
   existing_user_controller()->OnSigninScreenReady();
-  SetAutoLoginPolicy(kAutoLoginUsername, kAutoLoginLongDelay);
+  SetAutoLoginPolicy(kPublicSessionAccountId, kAutoLoginLongDelay);
   ASSERT_TRUE(auto_login_timer());
 
   // Login and check that it stopped the timer.
-  existing_user_controller()->LoginAsPublicAccount(kAutoLoginUsername);
+  existing_user_controller()->LoginAsPublicAccount(public_session_user_id_);
   EXPECT_TRUE(is_login_in_progress());
   ASSERT_TRUE(auto_login_timer());
   EXPECT_FALSE(auto_login_timer()->IsRunning());