Merge 107584 - [cros] Don't succeed if user has default profile picture. Merge 108860 - [cros] Fi...

chrome/browser/chromeos/login/user_manager.cc

Index: chrome/browser/chromeos/login/user_manager.cc
===================================================================
--- chrome/browser/chromeos/login/user_manager.cc	(revision 108979)
+++ chrome/browser/chromeos/login/user_manager.cc	(working copy)
@@ -681,6 +681,9 @@
 
 void UserManager::OnDownloadSuccess(const SkBitmap& image) {
   VLOG(1) << "Downloaded profile image for logged-in user.";
+  UMA_HISTOGRAM_ENUMERATION("UserImageDownloadResult.LoggedIn",
+                            ProfileImageDownloader::kDownloadSuccess,
+                            ProfileImageDownloader::kDownloadResultsCount);
 
   std::string current_image_data_url =
       web_ui_util::GetImageDataUrl(logged_in_user_.image());
@@ -688,6 +691,10 @@
       web_ui_util::GetImageDataUrl(image);
   if (current_image_data_url != new_image_data_url) {
     VLOG(1) << "Updating profile image for logged-in user";
+    UMA_HISTOGRAM_ENUMERATION("UserImageDownloadResult.LoggedIn",
+                              ProfileImageDownloader::kDownloadSuccessChanged,
+                              ProfileImageDownloader::kDownloadResultsCount);
+
     SetLoggedInUserImage(image, User::kProfileImageIndex);
     SaveUserImage(logged_in_user_.email(), image, User::kProfileImageIndex);
     NotificationService::current()->Notify(
@@ -697,6 +704,20 @@
   }
 }
 
+void UserManager::OnDownloadFailure() {
+  VLOG(1) << "Download of profile image for logged-in user failed.";
+  UMA_HISTOGRAM_ENUMERATION("UserImageDownloadResult.LoggedIn",
+                            ProfileImageDownloader::kDownloadFailure,
+                            ProfileImageDownloader::kDownloadResultsCount);
+}
+
+void UserManager::OnDownloadDefaultImage() {
+  VLOG(1) << "Logged-in user still has the default profile image.";
+  UMA_HISTOGRAM_ENUMERATION("UserImageDownloadResult.LoggedIn",
+                            ProfileImageDownloader::kDownloadDefault,
+                            ProfileImageDownloader::kDownloadResultsCount);
+}
+
 bool UserManager::IsLoggedInAsGuest() const {
   return logged_in_user().email() == kGuestUser;
 }