This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/extensions/file_manager/private_api_misc.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 "chrome/browser/chromeos/extensions/file_manager/private_api_misc.h"
 
 #include <set>
 #include <vector>
 
 #include "base/files/file_path.h"
@@ skipping 135 matching lines @@
   return true;
 }
 
 }  // namespace
 
 bool FileManagerPrivateLogoutUserForReauthenticationFunction::RunSync() {
   const user_manager::User* user =
       chromeos::ProfileHelper::Get()->GetUserByProfile(GetProfile());
   if (user) {
     user_manager::UserManager::Get()->SaveUserOAuthStatus(
-        user->email(), user_manager::User::OAUTH2_TOKEN_STATUS_INVALID);
+        user->GetAccountId(), user_manager::User::OAUTH2_TOKEN_STATUS_INVALID);
   }
 
   chrome::AttemptUserExit();
   return true;
 }
 
 bool FileManagerPrivateGetPreferencesFunction::RunSync() {
   api::file_manager_private::Preferences result;
   const PrefService* const service = GetProfile()->GetPrefs();
 
@@ skipping 516 matching lines @@
     base::File::Error result) {
   if (result != base::File::FILE_OK) {
     Respond(Error("Failed to execute the action."));
     return;
   }
 
   Respond(NoArguments());
 }
 
 }  // namespace extensions