cros: Clean up SessionStateDelegate refs in Chrome

chrome/browser/ui/ash/session_controller_client.cc

 // Copyright 2016 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 "chrome/browser/ui/ash/session_controller_client.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "ash/public/cpp/session_types.h"
@@ skipping 172 matching lines @@
 
   VLOG(1) << "Requesting screen lock from SessionControllerClient";
   chromeos::DBusThreadManager::Get()
       ->GetSessionManagerClient()
       ->RequestLockScreen();
 }
 
 // static
 void SessionControllerClient::DoSwitchActiveUser(const AccountId& account_id) {
   // Disallow switching to an already active user since that might crash.
-  // Also check that we got a user id and not an email address.
-  DCHECK_EQ(
-      account_id.GetUserEmail(),
-      gaia::CanonicalizeEmail(gaia::SanitizeEmail(account_id.GetUserEmail())));
   if (account_id == UserManager::Get()->GetActiveUser()->GetAccountId())
     return;
 
   TrySwitchingActiveUser(base::Bind(&DoSwitchUser, account_id));
 }
 
 // static
 void SessionControllerClient::DoCycleActiveUser(bool next_user) {
   const UserList& logged_in_users = UserManager::Get()->GetLoggedInUsers();
   if (logged_in_users.size() <= 1)
@@ skipping 79 matching lines @@
   const UserList logged_in_users = user_manager->GetLoggedInUsers();
   std::vector<uint32_t> user_session_ids;
   for (auto* user : user_manager->GetLRULoggedInUsers()) {
     const uint32_t user_session_id = GetSessionId(*user);
     DCHECK_NE(0u, user_session_id);
     user_session_ids.push_back(user_session_id);
   }
 
   session_controller_->SetUserSessionOrder(user_session_ids);
 }