This CL replaces std::string user_id in ash/* 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 22 matching lines @@
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
 #include "chrome/common/extensions/api/file_manager_private.h"
 #include "chrome/common/extensions/api/file_manager_private_internal.h"
 #include "chrome/common/extensions/api/manifest_types.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/settings/timezone_settings.h"
 #include "components/drive/drive_pref_names.h"
 #include "components/drive/event_logger.h"
+#include "components/signin/core/account_id/account_id.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/page_zoom.h"
 #include "extensions/browser/app_window/app_window.h"
 #include "extensions/browser/app_window/app_window_registry.h"
 #include "google_apis/drive/auth_service.h"
 #include "ui/base/webui/web_ui_util.h"
@@ skipping 28 matching lines @@
       continue;
     original_profiles.insert(profile);
     const user_manager::User* const user =
         chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
     if (!user || !user->is_logged_in())
       continue;
 
     // Make a ProfileInfo.
     linked_ptr<api::file_manager_private::ProfileInfo> profile_info(
         new api::file_manager_private::ProfileInfo());
-    profile_info->profile_id = multi_user_util::GetUserIDFromProfile(profile);
+    profile_info->profile_id =
+        multi_user_util::GetAccountIdFromProfile(profile).GetUserEmail();
     profile_info->display_name = UTF16ToUTF8(user->GetDisplayName());
     // TODO(hirono): Remove the property from the profile_info.
     profile_info->is_current_profile = true;
 
     result_profiles.push_back(profile_info);
   }
 
   return result_profiles;
 }
 
@@ skipping 267 matching lines @@
 }
 
 bool FileManagerPrivateGetProfilesFunction::RunSync() {
   const std::vector<linked_ptr<api::file_manager_private::ProfileInfo> >&
       profiles = GetLoggedInProfileInfoList();
 
   // Obtains the display profile ID.
   AppWindow* const app_window = GetCurrentAppWindow(this);
   chrome::MultiUserWindowManager* const window_manager =
       chrome::MultiUserWindowManager::GetInstance();
-  const std::string current_profile_id =
-      multi_user_util::GetUserIDFromProfile(GetProfile());
-  const std::string display_profile_id =
-      window_manager && app_window ? window_manager->GetUserPresentingWindow(
-                                         app_window->GetNativeWindow())
-                                   : "";
+  const AccountId current_profile_id =
+      multi_user_util::GetAccountIdFromProfile(GetProfile());
+  const AccountId display_profile_id =
+      window_manager && app_window
+          ? window_manager->GetUserPresentingWindow(
+                app_window->GetNativeWindow())
+          : EmptyAccountId();
 
   results_ = api::file_manager_private::GetProfiles::Results::Create(
-      profiles,
-      current_profile_id,
-      display_profile_id.empty() ? current_profile_id : display_profile_id);
+      profiles, current_profile_id.GetUserEmail(),
+      display_profile_id.is_valid() ? display_profile_id.GetUserEmail()
+                                    : current_profile_id.GetUserEmail());
   return true;
 }
 
 bool FileManagerPrivateOpenInspectorFunction::RunSync() {
   using extensions::api::file_manager_private::OpenInspector::Params;
   const scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
   switch (params->type) {
     case extensions::api::file_manager_private::INSPECTION_TYPE_NORMAL:
@@ skipping 283 matching lines @@
     base::File::Error result) {
   if (result != base::File::FILE_OK) {
     Respond(Error("Failed to execute the action."));
     return;
   }
 
   Respond(NoArguments());
 }
 
 }  // namespace extensions