CleanUp: Introduce UserInfo. Move session_state stuff to ash/session.

ash/frame/frame_util.cc

Index: ash/frame/frame_util.cc
diff --git a/ash/frame/frame_util.cc b/ash/frame/frame_util.cc
index bfa8c33548608c76c900bdc7d24a2a27690924b7..fd267830420c09a6d94018fa028ad3a27c4b39a0 100644
--- a/ash/frame/frame_util.cc
+++ b/ash/frame/frame_util.cc
@@ -4,7 +4,8 @@
 
 #include "ash/frame/frame_util.h"
 
-#include "ash/session_state_delegate.h"
+#include "ash/session/session_state_delegate.h"
+#include "ash/session/user_info.h"
 #include "ash/shell.h"
 #include "grit/ash_resources.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -20,8 +21,10 @@ gfx::Image GetAvatarImageForContext(content::BrowserContext* context) {
   static const gfx::ImageSkia* holder_mask =
       ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
           IDR_AVATAR_HOLDER_MASK);
-  gfx::ImageSkia user_image =
-      Shell::GetInstance()->session_state_delegate()->GetUserImage(context);
+  gfx::ImageSkia user_image = Shell::GetInstance()
+                                  ->session_state_delegate()
+                                  ->GetUserInfo(context)
+                                  ->GetImage();
   gfx::ImageSkia resized = gfx::ImageSkiaOperations::CreateResizedImage(
       user_image, skia::ImageOperations::RESIZE_BEST, holder->size());
   gfx::ImageSkia masked =