Use username_hash instead of email

chrome/browser/chromeos/extensions/wallpaper_api.cc

 // Copyright 2013 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/extensions/wallpaper_api.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/threading/worker_pool.h"
 #include "chrome/browser/chromeos/login/user.h"
@@ skipping 20 matching lines @@
   std::string layout_string;
   details->GetString("layout", &layout_string);
   EXTENSION_FUNCTION_VALIDATE(!layout_string.empty());
   layout_ = wallpaper_api_util::GetLayoutEnum(layout_string);
 
   details->GetBoolean("thumbnail", &generate_thumbnail_);
   details->GetString("name", &file_name_);
 
   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_);
 
   return true;
 }
 
 void WallpaperSetWallpaperFunction::OnWallpaperDecoded(
     const gfx::ImageSkia& wallpaper) {
   chromeos::WallpaperManager* wallpaper_manager =
       chromeos::WallpaperManager::Get();
   chromeos::UserImage::RawImage raw_image(image_data_.begin(),
                                           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);
   scoped_refptr<base::SequencedTaskRunner> task_runner =
       BrowserThread::GetBlockingPool()->
           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;
 
   if (generate_thumbnail_) {
     wallpaper.EnsureRepsForSupportedScaleFactors();
     scoped_ptr<gfx::ImageSkia> deep_copy(wallpaper.DeepCopy());
     // Generates thumbnail before call api function callback. We can then
     // request thumbnail in the javascript callback.
     task_runner->PostTask(FROM_HERE,
         base::Bind(
@@ skipping 26 matching lines @@
           this, data));
 }
 
 void WallpaperSetWallpaperFunction::ThumbnailGenerated(
     base::RefCountedBytes* data) {
   BinaryValue* result = BinaryValue::CreateWithCopiedBuffer(
       reinterpret_cast<const char*>(data->front()), data->size());
   SetResult(result);
   SendResponse(true);
 }