[cros] Profile image loaded from file is re-used if subsequent download fails.

chrome/browser/chromeos/login/user_manager.cc

 // Copyright (c) 2011 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_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
@@ skipping 679 matching lines @@
                                const SkBitmap& image) {
   User* user = const_cast<User*>(FindUser(username));
   // User may have been removed by now.
   if (user) {
     // For existing users, a valid image index should have been set upon loading
     // them from Local State.
     DCHECK(user->image_index() != User::kInvalidImageIndex ||
            current_user_is_new_);
     bool image_changed = user->image_index() != User::kInvalidImageIndex;
     user->SetImage(image, image_index);
+    // If it is the profile image of the current user, save it to
+    // |downloaded_profile_image_| so that it can be reused if the started
+    // download attempt fails.
+    if (image_index == User::kProfileImageIndex && user == logged_in_user_) {
+      downloaded_profile_image_ = image;
+      downloaded_profile_image_data_url_ = web_ui_util::GetImageDataUrl(image);
+    }
     if (image_changed) {
       // Unless this is first-time setting with |SetInitialUserImage|,
       // send a notification about image change.
       content::NotificationService::current()->Notify(
           chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED,
           content::Source<UserManager>(this),
           content::Details<const User>(user));
     }
   }
 }
@@ skipping 151 matching lines @@
     std::string new_image_data_url =
         web_ui_util::GetImageDataUrl(downloader->GetProfilePicture());
     if (!downloaded_profile_image_data_url_.empty() &&
         new_image_data_url == downloaded_profile_image_data_url_)
       return;
 
     downloaded_profile_image_data_url_ = new_image_data_url;
     downloaded_profile_image_ = downloader->GetProfilePicture();
 
     if (logged_in_user().image_index() == User::kProfileImageIndex) {
-      std::string current_image_data_url =
-          web_ui_util::GetImageDataUrl(logged_in_user().image());
-      if (current_image_data_url == new_image_data_url)
-        return;
-
       VLOG(1) << "Updating profile image for logged-in user";
       UMA_HISTOGRAM_ENUMERATION("UserImage.ProfileDownloadResult",
                                 kDownloadSuccessChanged,
                                 kDownloadResultsCount);
 
       // This will persist |downloaded_profile_image_| to file.
       SaveUserImageFromProfileImage(logged_in_user().email());
     }
   }
 
@@ skipping 14 matching lines @@
 
 User* UserManager::CreateUser(const std::string& email) const {
   User* user = new User(email);
   user->set_oauth_token_status(GetUserOAuthStatus(email));
   // Used to determine whether user's display name is unique.
   ++display_name_count_[user->GetDisplayName()];
   return user;
 }
 
 }  // namespace chromeos