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

trunk/src/ash/system/tray/default_system_tray_delegate.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 "ash/system/tray/default_system_tray_delegate.h"
 
 #include <string>
 
-#include "ash/session/session_state_delegate.h"
+#include "ash/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/volume_control_delegate.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
 
 namespace ash {
 
 namespace {
 
 class DefaultVolumnControlDelegate : public VolumeControlDelegate {
@@ skipping 275 matching lines @@
 bool DefaultSystemTrayDelegate::IsSearchKeyMappedToCapsLock() {
   return false;
 }
 
 tray::UserAccountsDelegate* DefaultSystemTrayDelegate::GetUserAccountsDelegate(
     const std::string& user_id) {
   return NULL;
 }
 
 }  // namespace ash