Move avatar holder code to ash

ash/test/test_session_state_delegate.cc

 // Copyright (c) 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/test/test_session_state_delegate.h"
 
 #include <algorithm>
 #include <string>
 
 #include "ash/shell.h"
@@ skipping 22 matching lines @@
       can_lock_screen_(true),
       should_lock_screen_before_suspending_(false),
       screen_locked_(false),
       user_adding_screen_running_(false),
       logged_in_users_(1) {
 }
 
 TestSessionStateDelegate::~TestSessionStateDelegate() {
 }
 
+content::BrowserContext*
+TestSessionStateDelegate::GetBrowserContextByIndex(
+    MultiProfileIndex index) {
+  return NULL;
+}
+
 int TestSessionStateDelegate::GetMaximumNumberOfLoggedInUsers() const {
   return 3;
 }
 
 int TestSessionStateDelegate::NumberOfLoggedInUsers() const {
   // TODO(skuhne): Add better test framework to test multiple profiles.
   return has_active_user_ ? logged_in_users_ : 0;
 }
 
 bool TestSessionStateDelegate::IsActiveUserSessionStarted() const {
@@ skipping 73 matching lines @@
     default: return "someone@tray";
   }
 }
 
 const std::string TestSessionStateDelegate::GetUserID(
     MultiProfileIndex index) const {
   return GetUserIDFromEmail(GetUserEmail(index));
 }
 
 const gfx::ImageSkia& TestSessionStateDelegate::GetUserImage(
-    MultiProfileIndex index) const {
+    content::BrowserContext* context) const {
   return null_image_;
 }
 
-void TestSessionStateDelegate::GetLoggedInUsers(UserIdList* users) {
+bool TestSessionStateDelegate::ShouldShowAvatar(aura::Window* window) {
+  return false;
 }
 
 void TestSessionStateDelegate::SwitchActiveUser(const std::string& user_id) {
   // Make sure this is a user id and not an email address.
   EXPECT_EQ(user_id, GetUserIDFromEmail(user_id));
   activated_user_ = user_id;
 }
 
 void TestSessionStateDelegate::CycleActiveUser(CycleUser cycle_user) {
   activated_user_ = "someone@tray";
 }
 
 void TestSessionStateDelegate::AddSessionStateObserver(
     SessionStateObserver* observer) {
 }
 
 void TestSessionStateDelegate::RemoveSessionStateObserver(
     SessionStateObserver* observer) {
 }
 
 }  // namespace test
 }  // namespace ash