[cros] Fix regression making impossible to select grey G+ avatar, now for realz.

chrome/browser/chromeos/login/user_manager_impl.cc

 // Copyright (c) 2012 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_impl.h"
 
 #include <vector>
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/shell.h"
@@ skipping 552 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!downloaded_profile_image_.empty()) {
     // Profile image has already been downloaded, so save it to file right now.
     DCHECK(profile_image_url_.is_valid());
     SaveUserImageInternal(
         username,
         User::kProfileImageIndex, profile_image_url_,
         UserImage::CreateAndEncode(downloaded_profile_image_));
   } else {
     // No profile image - use the stub image (gray avatar).
-    SetUserImage(username, User::kProfileImageIndex,
-                 GURL(), UserImage::CreateAndEncode(SkBitmap()));
+    SetUserImage(username, User::kProfileImageIndex, GURL(), UserImage());
     SaveImageToLocalState(username, "", User::kProfileImageIndex,
                           GURL(), false);
   }
 }
 
 void UserManagerImpl::DownloadProfileImage(const std::string& reason) {
   DownloadProfileData(reason, true);
 }
 
 void UserManagerImpl::Observe(int type,
@@ skipping 515 matching lines @@
                            reinterpret_cast<const char*>(&(*encoded_image)[0]),
                            encoded_image->size()) == -1) {
     LOG(ERROR) << "Failed to save image to file.";
     return false;
   }
   return true;
 }
 
 void UserManagerImpl::InitDownloadedProfileImage() {
   DCHECK(logged_in_user_);
+  DCHECK_EQ(logged_in_user_->image_index(), User::kProfileImageIndex);
   if (downloaded_profile_image_.empty() && !logged_in_user_->image_is_stub()) {
     VLOG(1) << "Profile image initialized";
     downloaded_profile_image_ = logged_in_user_->image();
     downloaded_profile_image_data_url_ =
         web_ui_util::GetImageDataUrl(gfx::ImageSkia(downloaded_profile_image_));
     profile_image_url_ = logged_in_user_->image_url();
   }
 }
 
 void UserManagerImpl::DownloadProfileData(const std::string& reason,
@@ skipping 252 matching lines @@
     BrowserThread::PostTask(
         BrowserThread::FILE,
         FROM_HERE,
         base::Bind(&UserManagerImpl::DeleteUserImage,
                    base::Unretained(this),
                    image_path));
   }
 }
 
 }  // namespace chromeos