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

chrome/browser/chromeos/login/user.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.h"
 
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/default_user_images.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
+#include "grit/theme_resources.h"
+#include "ui/base/resource/resource_bundle.h"
 
 namespace chromeos {
 
 namespace {
 
 // Returns account name portion of an email.
 std::string GetUserName(const std::string& email) {
   std::string::size_type i = email.find('@');
   if (i == 0 || i == std::string::npos) {
     return email;
@@ skipping 27 matching lines @@
   image_index_ = image_index;
   image_is_stub_ = false;
   DCHECK(HasDefaultImage() || user_image.has_raw_image());
 }
 
 void User::SetImageURL(const GURL& image_url) {
   user_image_.set_url(image_url);
 }
 
 void User::SetStubImage(int image_index) {
-  user_image_ = UserImage();
+  user_image_ = UserImage(
+      *ResourceBundle::GetSharedInstance().
+          GetImageSkiaNamed(IDR_PROFILE_PICTURE_LOADING));
   image_index_ = image_index;
   image_is_stub_ = true;
 }
 
 std::string User::GetAccountName(bool use_display_email) const {
   if (use_display_email && !display_email_.empty())
     return GetUserName(display_email_);
   else
     return GetUserName(email_);
 }
 
 bool User::HasDefaultImage() const {
   return image_index_ >= 0 && image_index_ < kDefaultImagesCount;
 }
 
 string16 User::GetDisplayName() const {
   // Fallback to the email account name in case display name haven't been set.
   return display_name_.empty() ?
       UTF8ToUTF16(GetAccountName(true)) :
       display_name_;
 }
 
 }  // namespace chromeos