Use username_hash instead of email

chrome/browser/chromeos/extensions/wallpaper_api.cc

Index: chrome/browser/chromeos/extensions/wallpaper_api.cc
diff --git a/chrome/browser/chromeos/extensions/wallpaper_api.cc b/chrome/browser/chromeos/extensions/wallpaper_api.cc
index 7bf76790c3e8cdd2efd04bcd6a1130d671242b48..998dfa9888848171e6e649632e34de456e1728fa 100644
--- a/chrome/browser/chromeos/extensions/wallpaper_api.cc
+++ b/chrome/browser/chromeos/extensions/wallpaper_api.cc
@@ -38,8 +38,10 @@ bool WallpaperSetWallpaperFunction::RunImpl() {
 
   EXTENSION_FUNCTION_VALIDATE(!file_name_.empty());
 
-  // Gets email address while at UI thread.
+  // Gets email address and username hash while at UI thread.
   email_ = chromeos::UserManager::Get()->GetLoggedInUser()->email();
+  username_hash_ =

[Nikita (slow), 2013/09/25 14:47:11]

This may be empty string if multi-profiles are not enabled.
Have you tested this w/o --multi-profiles switch?

[bshe, 2013/09/26 16:49:57]

I tested w/o --multi-profiles switch. It seems work for both cases.
These are the cases that I tested (have two logged in users on my dev machine):
1. no --multi-profiles
  a. login in one user, change custom wallpaper, logout, wallpaper
     works correctly.
  b. login again, navigate to about://inducebrowsercrashforrealz,
     change custom wallpaper again, verified the user_name_id is
     the real hash instead of "user". logout, custom wallpaper
     works correctly.
2. enable --multi-profiles
  a. login one user and then login another, repeat 1.b step. Works
     fine.
  b. login one user and then login another, switch to the new
     logged in user, repeat 1.b step. works fine.
  c. switch the primary login account and do 2.a and 2.b, works fine.

On 2013/09/25 14:47:11, Nikita Kostylev wrote:

+      chromeos::UserManager::Get()->GetLoggedInUser()->username_hash();
 
   image_data_.assign(input->GetBuffer(), input->GetSize());
   StartDecode(image_data_);
@@ -55,7 +57,7 @@ void WallpaperSetWallpaperFunction::OnWallpaperDecoded(
                                           image_data_.end());
   chromeos::UserImage image(wallpaper, raw_image);
   base::FilePath thumbnail_path = wallpaper_manager->GetCustomWallpaperPath(
-      chromeos::kThumbnailWallpaperSubDir, email_, file_name_);
+      chromeos::kThumbnailWallpaperSubDir, username_hash_, file_name_);
 
   sequence_token_ = BrowserThread::GetBlockingPool()->
       GetNamedSequenceToken(chromeos::kWallpaperSequenceTokenName);
@@ -64,10 +66,8 @@ void WallpaperSetWallpaperFunction::OnWallpaperDecoded(
           GetSequencedTaskRunnerWithShutdownBehavior(sequence_token_,
               base::SequencedWorkerPool::BLOCK_SHUTDOWN);
 
-  // In the new wallpaper picker UI, we do not depend on WallpaperDelegate
-  // to refresh thumbnail. Uses a null delegate here.
-  wallpaper_manager->SetCustomWallpaper(email_, file_name_, layout_,
-                                        chromeos::User::CUSTOMIZED,
+  wallpaper_manager->SetCustomWallpaper(email_, username_hash_, file_name_,

[Nikita (slow), 2013/09/25 14:47:11]

nit: One parameter per line please.

[bshe, 2013/09/26 16:49:57]

Done.

+                                        layout_, chromeos::User::CUSTOMIZED,
                                         image);
   unsafe_wallpaper_decoder_ = NULL;