ChromeOS cryptohome should be able to use gaia id as user identifier.

chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "base/message_loop/message_loop.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/ui/mock_login_display.h"
@@ skipping 83 matching lines @@
     CrosSettings::Get()->SetInteger(
         kAccountsPrefDeviceLocalAccountAutoLoginDelay,
         delay);
   }
 
   // ExistingUserController private member accessors.
   base::OneShotTimer* auto_login_timer() {
     return existing_user_controller()->auto_login_timer_.get();
   }
 
-  const std::string& auto_login_username() const {
-    return existing_user_controller()->public_session_auto_login_username_;
+  const AccountId& auto_login_account_id() const {
+    return existing_user_controller()->public_session_auto_login_account_id_;
   }
-  void set_auto_login_username(const std::string& username) {
-    existing_user_controller()->public_session_auto_login_username_ = username;
+  void set_auto_login_account_id(const AccountId& account_id) {
+    existing_user_controller()->public_session_auto_login_account_id_ =
+        account_id;
   }
 
   int auto_login_delay() const {
     return existing_user_controller()->public_session_auto_login_delay_;
   }
   void set_auto_login_delay(int delay) {
     existing_user_controller()->public_session_auto_login_delay_ = delay;
   }
 
   bool is_login_in_progress() const {
@@ skipping 31 matching lines @@
   MockUserManager* mock_user_manager_;
   ScopedUserManagerEnabler scoped_user_manager_;
 
   // |existing_user_controller_| must be destroyed before
   // |device_settings_test_helper_|.
   scoped_ptr<ExistingUserController> existing_user_controller_;
 };
 
 TEST_F(ExistingUserControllerAutoLoginTest, StartAutoLoginTimer) {
   // Timer shouldn't start until signin screen is ready.
-  set_auto_login_username(auto_login_account_id_.GetUserEmail());
+  set_auto_login_account_id(auto_login_account_id_);
   set_auto_login_delay(kAutoLoginDelay2);
   existing_user_controller()->StartPublicSessionAutoLoginTimer();
   EXPECT_FALSE(auto_login_timer());
 
   // Timer shouldn't start if the policy isn't set.
-  set_auto_login_username("");
+  set_auto_login_account_id(EmptyAccountId());
   existing_user_controller()->OnSigninScreenReady();
   existing_user_controller()->StartPublicSessionAutoLoginTimer();
   EXPECT_FALSE(auto_login_timer());
 
   // Timer shouldn't fire in the middle of a login attempt.
-  set_auto_login_username(auto_login_account_id_.GetUserEmail());
+  set_auto_login_account_id(auto_login_account_id_);
   set_is_login_in_progress(true);
   existing_user_controller()->StartPublicSessionAutoLoginTimer();
   EXPECT_FALSE(auto_login_timer());
 
   // Otherwise start.
   set_is_login_in_progress(false);
   existing_user_controller()->StartPublicSessionAutoLoginTimer();
   ASSERT_TRUE(auto_login_timer());
   EXPECT_TRUE(auto_login_timer()->IsRunning());
   EXPECT_EQ(auto_login_timer()->GetCurrentDelay().InMilliseconds(),
             kAutoLoginDelay2);
 }
 
 TEST_F(ExistingUserControllerAutoLoginTest, StopAutoLoginTimer) {
   existing_user_controller()->OnSigninScreenReady();
-  set_auto_login_username(auto_login_account_id_.GetUserEmail());
+  set_auto_login_account_id(auto_login_account_id_);
   set_auto_login_delay(kAutoLoginDelay2);
 
   existing_user_controller()->StartPublicSessionAutoLoginTimer();
   ASSERT_TRUE(auto_login_timer());
   EXPECT_TRUE(auto_login_timer()->IsRunning());
 
   existing_user_controller()->StopPublicSessionAutoLoginTimer();
   ASSERT_TRUE(auto_login_timer());
   EXPECT_FALSE(auto_login_timer()->IsRunning());
 }
 
 TEST_F(ExistingUserControllerAutoLoginTest, ResetAutoLoginTimer) {
   existing_user_controller()->OnSigninScreenReady();
-  set_auto_login_username(auto_login_account_id_.GetUserEmail());
+  set_auto_login_account_id(auto_login_account_id_);
 
   // Timer starts off not running.
   EXPECT_FALSE(auto_login_timer());
 
   // When the timer isn't running, nothing should happen.
   existing_user_controller()->ResetPublicSessionAutoLoginTimer();
   EXPECT_FALSE(auto_login_timer());
 
   // Start the timer.
   set_auto_login_delay(kAutoLoginDelay2);
@@ skipping 13 matching lines @@
             kAutoLoginDelay1);
 }
 
 TEST_F(ExistingUserControllerAutoLoginTest, ConfigureAutoLogin) {
   existing_user_controller()->OnSigninScreenReady();
 
   // Timer shouldn't start when the policy is disabled.
   ConfigureAutoLogin();
   EXPECT_FALSE(auto_login_timer());
   EXPECT_EQ(auto_login_delay(), 0);
-  EXPECT_EQ(auto_login_username(), "");
+  EXPECT_EQ(auto_login_account_id(), EmptyAccountId());
 
   // Timer shouldn't start when the delay alone is set.
   SetAutoLoginSettings("", kAutoLoginDelay1);
   ConfigureAutoLogin();
   EXPECT_FALSE(auto_login_timer());
   EXPECT_EQ(auto_login_delay(), kAutoLoginDelay1);
-  EXPECT_EQ(auto_login_username(), "");
+  EXPECT_EQ(auto_login_account_id(), EmptyAccountId());
 
   // Timer should start when the account ID is set.
   SetAutoLoginSettings(auto_login_user_id_, kAutoLoginDelay1);
   ConfigureAutoLogin();
   ASSERT_TRUE(auto_login_timer());
   EXPECT_TRUE(auto_login_timer()->IsRunning());
   EXPECT_EQ(auto_login_timer()->GetCurrentDelay().InMilliseconds(),
             kAutoLoginDelay1);
   EXPECT_EQ(auto_login_delay(), kAutoLoginDelay1);
-  EXPECT_EQ(auto_login_username(), auto_login_account_id_.GetUserEmail());
+  EXPECT_EQ(auto_login_account_id(), auto_login_account_id_);
 
   // Timer should restart when the delay is changed.
   SetAutoLoginSettings(auto_login_user_id_, kAutoLoginDelay2);
   ConfigureAutoLogin();
   ASSERT_TRUE(auto_login_timer());
   EXPECT_TRUE(auto_login_timer()->IsRunning());
   EXPECT_EQ(auto_login_timer()->GetCurrentDelay().InMilliseconds(),
             kAutoLoginDelay2);
   EXPECT_EQ(auto_login_delay(), kAutoLoginDelay2);
-  EXPECT_EQ(auto_login_username(), auto_login_account_id_.GetUserEmail());
+  EXPECT_EQ(auto_login_account_id(), auto_login_account_id_);
 
   // Timer should stop when the account ID is unset.
   SetAutoLoginSettings("", kAutoLoginDelay2);
   ConfigureAutoLogin();
   ASSERT_TRUE(auto_login_timer());
   EXPECT_FALSE(auto_login_timer()->IsRunning());
   EXPECT_EQ(auto_login_timer()->GetCurrentDelay().InMilliseconds(),
             kAutoLoginDelay2);
-  EXPECT_EQ(auto_login_username(), "");
+  EXPECT_EQ(auto_login_account_id(), EmptyAccountId());
   EXPECT_EQ(auto_login_delay(), kAutoLoginDelay2);
 }
 
 }  // namespace chromeos