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

chrome/browser/ui/webui/options2/chromeos/user_image_source.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/ui/webui/options2/chromeos/user_image_source.h"
 
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop.h"
 #include "base/string_split.h"
 #include "chrome/browser/chromeos/login/default_user_images.h"
@@ skipping 55 matching lines @@
 base::RefCountedMemory* UserImageSource::GetUserImage(
     const std::string& email,
     bool is_image_animated,
     ui::ScaleFactor scale_factor) const {
   const chromeos::User* user = chromeos::UserManager::Get()->FindUser(email);
   if (user) {
     if (user->has_animated_image() && is_image_animated) {
       return new base::RefCountedBytes(user->animated_image());
     } else if (user->has_raw_image()) {
       return new base::RefCountedBytes(user->raw_image());
+    } else if (user->image_is_stub()) {
+      return ResourceBundle::GetSharedInstance().
+          LoadDataResourceBytes(IDR_PROFILE_PICTURE_LOADING, scale_factor);
     } else if (user->HasDefaultImage()) {
       return ResourceBundle::GetSharedInstance().
           LoadDataResourceBytes(kDefaultImageResourceIDs[user->image_index()],
                                 scale_factor);
     } else {
       NOTREACHED() << "User with custom image missing raw data";
     }
   }
   return ResourceBundle::GetSharedInstance().
       LoadDataResourceBytes(IDR_LOGIN_DEFAULT_USER, scale_factor);
@@ skipping 30 matching lines @@
   if (is_image_animated) {
     const chromeos::User* user = chromeos::UserManager::Get()->FindUser(email);
     if (user && user->has_animated_image())
       return "image/gif";
   }
   return "image/png";
 }
 
 }  // namespace options2
 }  // namespace chromeos