This CL replaces user_manager::UserID with AccountId.

chrome/browser/sync/sync_ui_util.cc

 // Copyright (c) 2012 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/sync/sync_ui_util.h"
 
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/time_formatting.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_service.h"
@@ skipping 17 matching lines @@
 #include "components/signin/core/browser/signin_error_controller.h"
 #include "components/signin/core/browser/signin_manager_base.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/sessions/sync_session_snapshot.h"
 #include "sync/protocol/proto_enum_conversions.h"
 #include "sync/protocol/sync_protocol_error.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_CHROMEOS)
+#include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user_manager.h"
 #endif  // defined(OS_CHROMEOS)
 
 typedef GoogleServiceAuthError AuthError;
 
 namespace sync_ui_util {
 
 namespace {
 
 bool IsChromeDashboardEnabled() {
   const std::string group_name =
       base::FieldTrialList::FindFullName("ChromeDashboard");
   return group_name == "Enabled";
 }
 
 // Returns the message that should be displayed when the user is authenticated
 // and can connect to the sync server. If the user hasn't yet authenticated, an
 // empty string is returned.
 base::string16 GetSyncedStateStatusLabel(ProfileSyncService* service,
                                          const SigninManagerBase& signin,
                                          StatusLabelStyle style) {
   std::string user_display_name = signin.GetAuthenticatedAccountInfo().email;
 
 #if defined(OS_CHROMEOS)
   if (user_manager::UserManager::IsInitialized()) {
     // On CrOS user email is sanitized and then passed to the signin manager.
     // Original email (containing dots) is stored as "display email".
     user_display_name = user_manager::UserManager::Get()->GetUserDisplayEmail(
-        user_display_name);
+        AccountId::FromUserEmail(user_display_name));
   }
 #endif  // defined(OS_CHROMEOS)
 
   base::string16 user_name = base::UTF8ToUTF16(user_display_name);
 
   if (!user_name.empty()) {
     if (!service || service->IsManaged()) {
       // User is signed in, but sync is disabled.
       return l10n_util::GetStringFUTF16(IDS_SIGNED_IN_WITH_SYNC_DISABLED,
                                         user_name);
@@ skipping 312 matching lines @@
 base::string16 ConstructTime(int64 time_in_int) {
   base::Time time = base::Time::FromInternalValue(time_in_int);
 
   // If time is null the format function returns a time in 1969.
   if (time.is_null())
     return base::string16();
   return base::TimeFormatFriendlyDateAndTime(time);
 }
 
 }  // namespace sync_ui_util