Add a mojo interface for AccountId

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 37 matching lines @@
   }
 
   NOTREACHED();
   return 0u;
 }
 
 ash::mojom::UserSessionPtr UserToUserSession(const User& user) {
   ash::mojom::UserSessionPtr session = ash::mojom::UserSession::New();
   session->session_id = GetSessionId(&user);
   session->type = user.GetType();
-  // TODO(xiyuan): Add type map for AccountId.
-  session->serialized_account_id = user.GetAccountId().Serialize();
+  session->account_id = user.GetAccountId();
   session->display_name = base::UTF16ToUTF8(user.display_name());
   session->display_email = user.display_email();
 
   // TODO(xiyuan): Observe user image change and update.
   //     Tracked in http://crbug.com/670422
   // TODO(xiyuan): Support multiple scale factor.
   session->avatar = *user.GetImage().bitmap();
   if (session->avatar.isNull()) {
     session->avatar = *ResourceBundle::GetSharedInstance()
                            .GetImageSkiaNamed(IDR_PROFILE_PICTURE_LOADING)
@@ skipping 27 matching lines @@
   g_instance = nullptr;
 
   session_manager::SessionManager::Get()->RemoveObserver(this);
   UserManager::Get()->RemoveSessionStateObserver(this);
 }
 
 void SessionControllerClient::RequestLockScreen() {
   DoLockScreen();
 }
 
-void SessionControllerClient::SwitchActiveUser(
-    const std::string& serialized_account_id) {
-  // TODO(xiyuan): Add type map for AccountId.
-  AccountId account_id(EmptyAccountId());
-  if (!AccountId::Deserialize(serialized_account_id, &account_id)) {
-    LOG(ERROR) << "Bad account id for SwitchActiveUser.";
-    return;
-  }
-
+void SessionControllerClient::SwitchActiveUser(const AccountId& account_id) {
   DoSwitchActiveUser(account_id);
 }
 
 void SessionControllerClient::CycleActiveUser(bool next_user) {
   DoCycleActiveUser(next_user);
 }
 
 void SessionControllerClient::ActiveUserChanged(const User* active_user) {
   SendSessionInfoIfChanged();
 
@@ skipping 147 matching lines @@
 void SessionControllerClient::SendUserSessionOrder() {
   UserManager* const user_manager = UserManager::Get();
 
   const UserList logged_in_users = user_manager->GetLoggedInUsers();
   std::vector<uint32_t> user_session_ids;
   for (auto* user : user_manager->GetLRULoggedInUsers())
     user_session_ids.push_back(GetSessionId(user));
 
   session_controller_->SetUserSessionOrder(user_session_ids);
 }