This CL replaces user_manager::UserID with AccountId.

chrome/browser/net/nss_context_chromeos_browsertest.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/net/nss_context.h"
 
 #include "base/bind.h"
 #include "base/run_loop.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
@@ skipping 118 matching lines @@
   RegisterUser(kTestUser2);
   chromeos::StartupUtils::MarkOobeCompleted();
 }
 
 IN_PROC_BROWSER_TEST_F(NSSContextChromeOSBrowserTest, TwoUsers) {
   user_manager::UserManager* user_manager = user_manager::UserManager::Get();
 
   // Log in first user and get their DB.
   LoginUser(kTestUser1);
   Profile* profile1 = chromeos::ProfileHelper::Get()->GetProfileByUserUnsafe(
-      user_manager->FindUser(kTestUser1));
+      user_manager->FindUser(AccountId::FromUserEmail(kTestUser1)));
   ASSERT_TRUE(profile1);
 
   DBTester tester1(profile1);
   ASSERT_TRUE(tester1.DoGetDBTests());
 
   // Log in second user and get their DB.
   chromeos::UserAddingScreen::Get()->Start();
   base::RunLoop().RunUntilIdle();
   AddUser(kTestUser2);
 
   Profile* profile2 = chromeos::ProfileHelper::Get()->GetProfileByUserUnsafe(
-      user_manager->FindUser(kTestUser2));
+      user_manager->FindUser(AccountId::FromUserEmail(kTestUser2)));
   ASSERT_TRUE(profile2);
 
   DBTester tester2(profile2);
   ASSERT_TRUE(tester2.DoGetDBTests());
 
   // Get both DBs again to check that the same object is returned.
   tester1.DoGetDBAgainTests();
   tester2.DoGetDBAgainTests();
 
   // Check that each user has a separate DB and NSS slots.
   tester1.DoNotEqualsTests(&tester2);
 }