This CL replaces std::string user_id in ash/* with AccountId.

chrome/browser/ui/browser_navigator_browsertest_chromeos.cc

 // Copyright 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/ui/browser_navigator_browsertest.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/chromeos/login/chrome_restart_request.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_test.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chromeos/chromeos_switches.h"
+#include "components/signin/core/account_id/account_id.h"
 #include "content/public/browser/web_contents.h"
 
 namespace {
 
 GURL GetGoogleURL() {
   return GURL("http://www.google.com/");
 }
 
 // Subclass that tests navigation while in the Guest session.
 class BrowserGuestSessionNavigatorTest: public BrowserNavigatorTest {
@@ skipping 39 matching lines @@
 
 // Test that in multi user environments a newly created browser gets created
 // on the same desktop as the browser is shown on.
 //
 // Flakily hits assert: http://crbug.com/469717
 IN_PROC_BROWSER_TEST_F(BrowserGuestSessionNavigatorTest,
                        DISABLED_Browser_Gets_Created_On_Visiting_Desktop) {
   // Test 1: Test that a browser created from a visiting browser will be on the
   // same visiting desktop.
   {
-    const std::string desktop_user_id = "desktop_user_id@fake.com";
+    const AccountId desktop_account_id(
+        AccountId::FromUserEmail("desktop_user_id@fake.com"));
     TestMultiUserWindowManager* manager =
-        new TestMultiUserWindowManager(browser(), desktop_user_id);
+        new TestMultiUserWindowManager(browser(), desktop_account_id);
 
     EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
 
     // Navigate to the settings page.
     chrome::NavigateParams params(MakeNavigateParams(browser()));
     params.disposition = NEW_POPUP;
     params.url = GURL("chrome://chrome/settings");
     params.window_action = chrome::NavigateParams::SHOW_WINDOW;
     params.path_behavior = chrome::NavigateParams::IGNORE_AND_NAVIGATE;
     params.browser = browser();
     chrome::Navigate(&params);
 
     EXPECT_EQ(2u, chrome::GetTotalBrowserCount());
 
     aura::Window* created_window = manager->created_window();
     ASSERT_TRUE(created_window);
-    EXPECT_TRUE(manager->IsWindowOnDesktopOfUser(created_window,
-                                                 desktop_user_id));
+    EXPECT_TRUE(
+        manager->IsWindowOnDesktopOfUser(created_window, desktop_account_id));
   }
   // Test 2: Test that a window which is not visiting does not cause an owner
   // assignment of a newly created browser.
   {
-    std::string browser_owner =
-        multi_user_util::GetUserIDFromProfile(browser()->profile());
+    const AccountId browser_owner =
+        multi_user_util::GetAccountIdFromProfile(browser()->profile());
     TestMultiUserWindowManager* manager =
         new TestMultiUserWindowManager(browser(), browser_owner);
 
     // Navigate to the settings page.
     chrome::NavigateParams params(MakeNavigateParams(browser()));
     params.disposition = NEW_POPUP;
     params.url = GURL("chrome://chrome/settings");
     params.window_action = chrome::NavigateParams::SHOW_WINDOW;
     params.path_behavior = chrome::NavigateParams::IGNORE_AND_NAVIGATE;
     params.browser = browser();
     chrome::Navigate(&params);
 
     EXPECT_EQ(3u, chrome::GetTotalBrowserCount());
 
     // The ShowWindowForUser should not have been called since the window is
     // already on the correct desktop.
     ASSERT_FALSE(manager->created_window());
   }
 }
 
 }  // namespace