This CL replaces e-mail with AccountId in wallpaper manager code.

chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_WALLPAPER_WALLPAPER_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_WALLPAPER_WALLPAPER_MANAGER_H_
 
 #include <deque>
 #include <string>
 #include <vector>
@@ skipping 52 matching lines @@
   // Initializes wallpaper. If logged in, loads user's wallpaper. If not logged
   // in, uses a solid color wallpaper. If logged in as a stub user, uses an
   // empty wallpaper.
   void InitializeWallpaper() override;
 
   // NotificationObserver overrides:
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
-  // Removes all |user_id| related wallpaper info and saved wallpapers.
-  void RemoveUserWallpaperInfo(const std::string& user_id) override;
+  // Removes all |account_id| related wallpaper info and saved wallpapers.
+  void RemoveUserWallpaperInfo(const AccountId& account_id) override;
 
   // Called when the policy-set wallpaper has been fetched.  Initiates decoding
   // of the JPEG |data| with a callback to SetPolicyControlledWallpaper().
   void OnPolicyFetched(const std::string& policy,
-                       const std::string& user_id,
+                       const AccountId& account_id,
                        scoped_ptr<std::string> data) override;
 
   // Saves custom wallpaper to file, post task to generate thumbnail and updates
   // local state preferences. If |update_wallpaper| is false, don't change
   // wallpaper but only update cache.
-  void SetCustomWallpaper(const std::string& user_id,
+  void SetCustomWallpaper(const AccountId& account_id,
                           const std::string& user_id_hash,
                           const std::string& file,
                           wallpaper::WallpaperLayout layout,
                           user_manager::User::WallpaperType type,
                           const gfx::ImageSkia& image,
                           bool update_wallpaper) override;
 
   // Sets wallpaper to default wallpaper (asynchronously with zero delay).
-  void SetDefaultWallpaperNow(const std::string& user_id) override;
+  void SetDefaultWallpaperNow(const AccountId& account_id) override;
 
   // Sets wallpaper to default wallpaper (asynchronously with default delay).
-  void SetDefaultWallpaperDelayed(const std::string& user_id) override;
+  void SetDefaultWallpaperDelayed(const AccountId& account_id) override;
 
   // Sets wallpaper to default.
   void DoSetDefaultWallpaper(
-      const std::string& user_id,
+      const AccountId& account_id,
       wallpaper::MovableOnDestroyCallbackHolder on_finish) override;
 
-  // Sets selected wallpaper information for |user_id| and saves it to Local
+  // Sets selected wallpaper information for |account_id| and saves it to Local
   // State if |is_persistent| is true.
-  void SetUserWallpaperInfo(const std::string& user_id,
+  void SetUserWallpaperInfo(const AccountId& account_id,
                             const wallpaper::WallpaperInfo& info,
                             bool is_persistent) override;
 
   // Creates new PendingWallpaper request (or updates currently pending).
-  void ScheduleSetUserWallpaper(const std::string& user_id,
+  void ScheduleSetUserWallpaper(const AccountId& account_id,
                                 bool delayed) override;
 
   // Sets wallpaper to |image| (asynchronously with zero delay). If
   // |update_wallpaper| is false, skip change wallpaper but only update cache.
-  void SetWallpaperFromImageSkia(const std::string& user_id,
+  void SetWallpaperFromImageSkia(const AccountId& account_id,
                                  const gfx::ImageSkia& image,
                                  wallpaper::WallpaperLayout layout,
                                  bool update_wallpaper) override;
 
   // Returns queue size.
   size_t GetPendingListSizeForTesting() const override;
 
   // Overridden from user_manager::UserManager::UserSessionStateObserver:
   void UserChangedChildStatus(user_manager::User* user) override;
 
  private:
   friend class TestApi;
   friend class WallpaperManagerBrowserTest;
   friend class WallpaperManagerBrowserTestDefaultWallpaper;
   friend class WallpaperManagerPolicyTest;
 
   WallpaperManager();
 
   // Returns modifiable PendingWallpaper.
   // Returns pending_inactive_ or creates new PendingWallpaper if necessary.
-  PendingWallpaper* GetPendingWallpaper(const std::string& user_id,
+  PendingWallpaper* GetPendingWallpaper(const AccountId& account_id,
                                         bool delayed);
 
   // This is called by PendingWallpaper when load is finished.
   void RemovePendingWallpaperFromList(PendingWallpaper* pending);
 
   // WallpaperManagerBase overrides:
   void InitializeRegisteredDeviceWallpaper() override;
-  bool GetUserWallpaperInfo(const std::string& user_id,
+  bool GetUserWallpaperInfo(const AccountId& account_id,
                             wallpaper::WallpaperInfo* info) const override;
-  void OnWallpaperDecoded(const std::string& user_id,
+  void OnWallpaperDecoded(const AccountId& account_id,
                           wallpaper::WallpaperLayout layout,
                           bool update_wallpaper,
                           wallpaper::MovableOnDestroyCallbackHolder on_finish,
                           const user_manager::UserImage& user_image) override;
-  void StartLoad(const std::string& user_id,
+  void StartLoad(const AccountId& account_id,
                  const wallpaper::WallpaperInfo& info,
                  bool update_wallpaper,
                  const base::FilePath& wallpaper_path,
                  wallpaper::MovableOnDestroyCallbackHolder on_finish) override;
   void SetCustomizedDefaultWallpaperAfterCheck(
       const GURL& wallpaper_url,
       const base::FilePath& downloaded_file,
       scoped_ptr<CustomizedWallpaperRescaledFiles> rescaled_files) override;
   void OnCustomizedDefaultWallpaperResized(
       const GURL& wallpaper_url,
@@ skipping 34 matching lines @@
   typedef std::vector<scoped_refptr<PendingWallpaper> > PendingList;
   PendingList loading_;
 
   base::WeakPtrFactory<WallpaperManager> weak_factory_;
   DISALLOW_COPY_AND_ASSIGN(WallpaperManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_WALLPAPER_WALLPAPER_MANAGER_H_