Revert 267158 "CleanUp: Introduce UserInfo. Move session_state s..."

trunk/src/ash/system/user/login_status.cc

 // Copyright (c) 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 "ash/system/user/login_status.h"
 
-#include "ash/session/session_state_delegate.h"
+#include "ash/session_state_delegate.h"
 #include "ash/shell.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ash_strings.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace ash {
 namespace user {
 
 base::string16 GetLocalizedSignOutStringForStatus(LoginStatus status,
@@ skipping 25 matching lines @@
   // handled. Depending on the value of |multiline|, actual line breaks or
   // spaces are substituted.
   base::string16 newline = multiline ? base::ASCIIToUTF16("\n")
                                      : base::ASCIIToUTF16(" ");
   ReplaceSubstringsAfterOffset(&message, 0, base::ASCIIToUTF16("\\n"), newline);
   return message;
 }
 
 }  // namespace user
 }  // namespace ash