Revert 194578 "Add ash SessionStateDelegate"

trunk/src/ash/system/tray/test_system_tray_delegate.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/tray/test_system_tray_delegate.h"
 
 #include <string>
 
-#include "ash/session_state_delegate.h"
 #include "ash/shell.h"
+#include "ash/shell_delegate.h"
 #include "ash/volume_control_delegate.h"
 #include "base/utf_string_conversions.h"
 #include "base/message_loop.h"
 #include "base/string16.h"
 #include "base/time.h"
 
 namespace ash {
 namespace test {
 
 namespace {
@@ skipping 62 matching lines @@
   return "über@tray";
 }
 
 const gfx::ImageSkia& TestSystemTrayDelegate::GetUserImage() const {
   return null_image_;
 }
 
 user::LoginStatus TestSystemTrayDelegate::GetUserLoginStatus() const {
   // At new user image screen manager->IsUserLoggedIn() would return true
   // but there's no browser session available yet so use SessionStarted().
-  SessionStateDelegate* delegate =
-      Shell::GetInstance()->session_state_delegate();
-
-  if (!delegate->IsActiveUserSessionStarted())
+  if (!Shell::GetInstance()->delegate()->IsSessionStarted())
     return ash::user::LOGGED_IN_NONE;
-  if (delegate->IsScreenLocked())
+  if (Shell::GetInstance()->IsScreenLocked())
     return user::LOGGED_IN_LOCKED;
   // TODO(nkostylev): Support LOGGED_IN_OWNER, LOGGED_IN_GUEST, LOGGED_IN_KIOSK,
   //                  LOGGED_IN_PUBLIC.
   return user::LOGGED_IN_USER;
 }
 
 bool TestSystemTrayDelegate::IsOobeCompleted() const {
   return true;
 }
 
@@ skipping 257 matching lines @@
 base::string16 TestSystemTrayDelegate::FormatTimeDuration(
     const base::TimeDelta& delta) const {
   return base::string16();
 }
 
 void TestSystemTrayDelegate::MaybeSpeak(const std::string& utterance) const {
 }
 
 }  // namespace test
 }  // namespace ash