[cros] Fix broken profile image on Options/Change picture page.

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/shell.h"
 #include "ash/desktop_background/desktop_background_controller.h"
@@ skipping 1407 matching lines @@
       UMA_HISTOGRAM_ENUMERATION("UserImage.ProfileDownloadResult",
                                 kDownloadSuccessChanged,
                                 kDownloadResultsCount);
 
       // This will persist |downloaded_profile_image_| to file.
       SaveUserImageFromProfileImage(GetLoggedInUser().email());
     }
   }
 
   if (result == kDownloadSuccess) {
+    // TODO(ivankr): temporary measure until UserManager is fully migrated
+    // to use ImageSkia instead of SkBitmap.
+    gfx::ImageSkia profile_image(downloaded_profile_image_);
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_PROFILE_IMAGE_UPDATED,
         content::Source<UserManagerImpl>(this),
-        content::Details<const SkBitmap>(&downloaded_profile_image_));
+        content::Details<const gfx::ImageSkia>(&profile_image));
   } else {
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_PROFILE_IMAGE_UPDATE_FAILED,
         content::Source<UserManagerImpl>(this),
         content::NotificationService::NoDetails());
   }
 }
 
 User* UserManagerImpl::CreateUser(const std::string& email) const {
   User* user = new User(email, email == kGuestUser);
@@ skipping 66 matching lines @@
     BrowserThread::PostTask(
         BrowserThread::FILE,
         FROM_HERE,
         base::Bind(&UserManagerImpl::DeleteUserImage,
                    base::Unretained(this),
                    image_path));
   }
 }
 
 }  // namespace chromeos