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

trunk/src/chrome/browser/chromeos/login/user_image_manager_impl.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 "chrome/browser/chromeos/login/user_image_manager_impl.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ skipping 840 matching lines @@
 
 void UserImageManagerImpl::TryToInitDownloadedProfileImage() {
   const User* user = GetUser();
   if (user->image_index() == User::kProfileImageIndex &&
       downloaded_profile_image_.isNull() &&
       !user->image_is_stub()) {
     // Initialize the |downloaded_profile_image_| for the currently logged-in
     // user if it has not been initialized already, the user image is the
     // profile image and the user image has been loaded successfully.
     VLOG(1) << "Profile image initialized from disk.";
-    downloaded_profile_image_ = user->GetImage();
+    downloaded_profile_image_ = user->image();
     profile_image_url_ = user->image_url();
   }
 }
 
 bool UserImageManagerImpl::NeedProfileImage() const {
   const User* user = GetUser();
   return IsUserLoggedInAndRegular() &&
       (user->image_index() == User::kProfileImageIndex ||
        profile_image_requested_);
 }
@@ skipping 122 matching lines @@
 }
 
 bool UserImageManagerImpl::IsUserLoggedInAndRegular() const {
   const User* user = GetUser();
   if (!user)
     return false;
   return user->is_logged_in() && user->GetType() == User::USER_TYPE_REGULAR;
 }
 
 }  // namespace chromeos