This CL replaces std::string user_id in ash/* with AccountId.

ash/test/test_session_state_delegate.cc

 // Copyright (c) 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 "ash/test/test_session_state_delegate.h"
 
 #include <algorithm>
 #include <string>
 
 #include "ash/shell.h"
 #include "ash/system/user/login_status.h"
 #include "base/stl_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace ash {
 namespace test {
 
 namespace {
 
-// The the "canonicalized" Account ID from a given |email| address.
-AccountId GetAccountIdFromEmail(const std::string& email) {
+// Returns the "canonicalized" email from a given |email| address.
+std::string GetUserIdFromEmail(const std::string& email) {
   std::string user_id = email;
   std::transform(user_id.begin(), user_id.end(), user_id.begin(), ::tolower);
-  return AccountId::FromUserEmail(user_id);
+  return user_id;
+}
+
+// Returns Account ID from a given |email| address.
+AccountId GetAccountIdFromEmail(const std::string& email) {
+  return AccountId::FromUserEmail(GetUserIdFromEmail(email));
 }
 
 }  // namespace
 
 class MockUserInfo : public user_manager::UserInfo {
  public:
   explicit MockUserInfo(const std::string& display_email)
       : display_email_(display_email),
         account_id_(GetAccountIdFromEmail(display_email)) {}
   ~MockUserInfo() override {}
@@ skipping 55 matching lines @@
   user_list_.push_back(
       new MockUserInfo("Second@tray"));  // This is intended to be capitalized.
   user_list_.push_back(new MockUserInfo("third@tray"));
   user_list_.push_back(new MockUserInfo("someone@tray"));
 }
 
 TestSessionStateDelegate::~TestSessionStateDelegate() {
   STLDeleteElements(&user_list_);
 }
 
-void TestSessionStateDelegate::AddUser(const std::string& user_id) {
-  user_list_.push_back(new MockUserInfo(user_id));
+void TestSessionStateDelegate::AddUser(const AccountId& account_id) {
+  user_list_.push_back(new MockUserInfo(account_id.GetUserEmail()));
 }
 
 const user_manager::UserInfo* TestSessionStateDelegate::GetActiveUserInfo()
     const {
   return user_list_[active_user_index_];
 }
 
 int TestSessionStateDelegate::GetMaximumNumberOfLoggedInUsers() const {
   return 3;
 }
@@ skipping 93 matching lines @@
 
 bool TestSessionStateDelegate::ShouldShowAvatar(aura::Window* window) const {
   return !GetActiveUserInfo()->GetImage().isNull();
 }
 
 gfx::ImageSkia TestSessionStateDelegate::GetAvatarImageForWindow(
     aura::Window* window) const {
   return gfx::ImageSkia();
 }
 
-void TestSessionStateDelegate::SwitchActiveUser(const std::string& user_id) {
-  const AccountId account_id(GetAccountIdFromEmail(user_id));
+void TestSessionStateDelegate::SwitchActiveUser(const AccountId& account_id) {
   // Make sure this is a user id and not an email address.
-  EXPECT_EQ(user_id, account_id.GetUserEmail());
+  EXPECT_EQ(account_id.GetUserEmail(),
+            GetUserIdFromEmail(account_id.GetUserEmail()));
   active_user_index_ = 0;
   for (std::vector<MockUserInfo*>::iterator iter = user_list_.begin();
        iter != user_list_.end();
        ++iter) {
     if ((*iter)->GetAccountId() == account_id) {
       active_user_index_ = iter - user_list_.begin();
       return;
     }
   }
   NOTREACHED() << "Unknown user:" << account_id.GetUserEmail();
 }
 
 void TestSessionStateDelegate::CycleActiveUser(CycleUser cycle_user) {
-  SwitchActiveUser("someone@tray");
+  SwitchActiveUser(AccountId::FromUserEmail("someone@tray"));
 }
 
 bool TestSessionStateDelegate::IsMultiProfileAllowedByPrimaryUserPolicy()
     const {
   return true;
 }
 
 void TestSessionStateDelegate::AddSessionStateObserver(
     SessionStateObserver* observer) {
 }
 
 void TestSessionStateDelegate::RemoveSessionStateObserver(
     SessionStateObserver* observer) {
 }
 
 }  // namespace test
 }  // namespace ash