Revert of This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/login/app_launch_signin_screen.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/login/app_launch_signin_screen.h"
 
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/help_app_launcher.h"
 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h"
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
@@ skipping 24 matching lines @@
 void AppLaunchSigninScreen::Show() {
   InitOwnerUserList();
   oobe_ui_->web_ui()->CallJavascriptFunction(
       "login.AccountPickerScreen.setShouldShowApps",
       base::FundamentalValue(false));
   oobe_ui_->ShowSigninScreen(LoginScreenContext(), this, NULL);
 }
 
 void AppLaunchSigninScreen::InitOwnerUserList() {
   user_manager::UserManager* user_manager = GetUserManager();
-  const std::string& owner_email =
-      user_manager->GetOwnerAccountId().GetUserEmail();
+  const std::string& owner_email = user_manager->GetOwnerEmail();
   const user_manager::UserList& all_users = user_manager->GetUsers();
 
   owner_user_list_.clear();
   for (user_manager::UserList::const_iterator it = all_users.begin();
        it != all_users.end();
        ++it) {
     user_manager::User* user = *it;
     if (user->email() == owner_email) {
       owner_user_list_.push_back(user);
       break;
@@ skipping 159 matching lines @@
 
 void AppLaunchSigninScreen::CheckUserStatus(const std::string& user_id) {
 }
 
 bool AppLaunchSigninScreen::IsUserWhitelisted(const std::string& user_id) {
   NOTREACHED();
   return true;
 }
 
 }  // namespace chromeos