| Index: chrome/browser/chromeos/login/session/user_session_manager.cc | 
| diff --git a/chrome/browser/chromeos/login/session/user_session_manager.cc b/chrome/browser/chromeos/login/session/user_session_manager.cc | 
| index d0ec14a2e07bc5d46f363572d6d7235dedaa607e..5ec314825416760301fcf9768160eefbb0d5697b 100644 | 
| --- a/chrome/browser/chromeos/login/session/user_session_manager.cc | 
| +++ b/chrome/browser/chromeos/login/session/user_session_manager.cc | 
| @@ -91,7 +91,6 @@ | 
| #include "chromeos/dbus/dbus_thread_manager.h" | 
| #include "chromeos/dbus/session_manager_client.h" | 
| #include "chromeos/login/auth/stub_authenticator.h" | 
| -#include "chromeos/login/user_names.h" | 
| #include "chromeos/network/portal_detector/network_portal_detector.h" | 
| #include "chromeos/network/portal_detector/network_portal_detector_strategy.h" | 
| #include "chromeos/settings/cros_settings_names.h" | 
| @@ -111,6 +110,7 @@ | 
| #include "components/user_manager/known_user.h" | 
| #include "components/user_manager/user.h" | 
| #include "components/user_manager/user_manager.h" | 
| +#include "components/user_manager/user_names.h" | 
| #include "components/user_manager/user_type.h" | 
| #include "content/public/browser/browser_thread.h" | 
| #include "content/public/browser/notification_service.h" | 
| @@ -442,7 +442,7 @@ void UserSessionManager::CompleteGuestSessionLogin(const GURL& start_url) { | 
| if (!about_flags::AreSwitchesIdenticalToCurrentCommandLine( | 
| user_flags, *base::CommandLine::ForCurrentProcess(), NULL)) { | 
| DBusThreadManager::Get()->GetSessionManagerClient()->SetFlagsForUser( | 
| -        cryptohome::Identification(login::GuestAccountId()), | 
| +        cryptohome::Identification(user_manager::GuestAccountId()), | 
| base::CommandLine::StringVector()); | 
| } | 
|  | 
|  |