This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/login/supervised/supervised_user_test_base.cc

 // Copyright 2014 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/login/supervised/supervised_user_test_base.h"
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/run_loop.h"
@@ skipping 276 matching lines @@
 
   // Select the first user as manager, and enter password.
   JSExpect("$('supervised-user-creation-next-button').disabled");
   JSSetTextField("#supervised-user-creation .manager-pod.focused input",
                  kTestManagerPassword);
 
   JSEval("$('supervised-user-creation').updateNextButtonForManager_()");
 
   // Next button is now enabled.
   JSExpect("!$('supervised-user-creation-next-button').disabled");
-  UserContext user_context(kTestManager);
+  UserContext user_context(AccountId::FromUserEmail(kTestManager));
   user_context.SetGaiaID(GetGaiaIDForUserID(kTestManager));
   user_context.SetKey(Key(kTestManagerPassword));
   SetExpectedCredentials(user_context);
   content::WindowedNotificationObserver login_observer(
       chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
       content::NotificationService::AllSources());
 
   // Log in as manager.
   JSEval("$('supervised-user-creation-next-button').click()");
   login_observer.Wait();
 
   // OAuth token is valid.
   user_manager::UserManager::Get()->SaveUserOAuthStatus(
-      kTestManager, user_manager::User::OAUTH2_TOKEN_STATUS_VALID);
+      AccountId::FromUserEmail(kTestManager),
+      user_manager::User::OAUTH2_TOKEN_STATUS_VALID);
   base::RunLoop().RunUntilIdle();
 
   // Check the page have changed.
   JSExpect(StringPrintf("%s == 'username'", kCurrentPage));
 }
 
 void SupervisedUserTestBase::FillNewUserData(const std::string& display_name) {
   JSExpect("$('supervised-user-creation-next-button').disabled");
   JSSetTextField("#supervised-user-creation-name", display_name);
   JSEval("$('supervised-user-creation').checkUserName_()");
@@ skipping 117 matching lines @@
   JSEval(StringPrintf(
       "$('pod-row').pods[%d].querySelector('.remove-warning-button').click()",
       user_index));
 
   // Make sure there is no supervised user in list.
   ASSERT_EQ(original_user_count - 1,
             user_manager::UserManager::Get()->GetUsers().size());
 }
 
 }  // namespace chromeos