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

chrome/browser/chromeos/extensions/wallpaper_private_api.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_WALLPAPER_PRIVATE_API_H_
 #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_WALLPAPER_PRIVATE_API_H_
 
 #include <string>
 #include <vector>
 
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chromeos/extensions/wallpaper_function_base.h"
 #include "chrome/common/extensions/api/wallpaper_private.h"
+#include "components/signin/core/account_id/account_id.h"
 #include "net/url_request/url_fetcher_delegate.h"
 
 namespace chromeos {
 class UserImage;
 }  // namespace chromeos
 
 // Wallpaper manager strings.
 class WallpaperPrivateGetStringsFunction : public SyncExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("wallpaperPrivate.getStrings",
@@ skipping 41 matching lines @@
 
   // Reads file specified by |file_path|. If success, post a task to start
   // decoding the file.
   void ReadFileAndInitiateStartDecode(const base::FilePath& file_path,
                                       const base::FilePath& fallback_path);
 
   scoped_ptr<extensions::api::wallpaper_private::SetWallpaperIfExists::Params>
       params;
 
   // User id of the active user when this api is been called.
-  std::string user_id_;
+  AccountId account_id_ = EmptyAccountId();
 
   // Sequence token associated with wallpaper operations. Shared with
   // WallpaperManager.
   base::SequencedWorkerPool::SequenceToken sequence_token_;
 };
 
 class WallpaperPrivateSetWallpaperFunction : public WallpaperFunctionBase {
  public:
   DECLARE_EXTENSION_FUNCTION("wallpaperPrivate.setWallpaper",
                              WALLPAPERPRIVATE_SETWALLPAPER)
@@ skipping 14 matching lines @@
 
   // Sets wallpaper to the decoded image.
   void SetDecodedWallpaper(scoped_ptr<gfx::ImageSkia> image);
 
   scoped_ptr<extensions::api::wallpaper_private::SetWallpaper::Params> params;
 
   // The decoded wallpaper. It may accessed from UI thread to set wallpaper or
   // FILE thread to resize and save wallpaper to disk.
   gfx::ImageSkia wallpaper_;
 
-  // User id of the active user when this api is been called.
-  std::string user_id_;
+  // User account id of the active user when this api is been called.
+  AccountId account_id_ = EmptyAccountId();
 
   // Sequence token associated with wallpaper operations. Shared with
   // WallpaperManager.
   base::SequencedWorkerPool::SequenceToken sequence_token_;
 };
 
 class WallpaperPrivateResetWallpaperFunction
     : public AsyncExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("wallpaperPrivate.resetWallpaper",
@@ skipping 29 matching lines @@
   // generating thunbail.
   void GenerateThumbnail(const base::FilePath& thumbnail_path,
                          scoped_ptr<gfx::ImageSkia> image);
 
   // Thumbnail is ready. Calls api function javascript callback.
   void ThumbnailGenerated(base::RefCountedBytes* data);
 
   scoped_ptr<extensions::api::wallpaper_private::SetCustomWallpaper::Params>
       params;
 
-  // User id of the active user when this api is been called.
-  std::string user_id_;
+  // User account id of the active user when this api is been called.
+  AccountId account_id_ = EmptyAccountId();
 
   // User id hash of the logged in user.
   std::string user_id_hash_;
 
   // Sequence token associated with wallpaper operations. Shared with
   // WallpaperManager.
   base::SequencedWorkerPool::SequenceToken sequence_token_;
 };
 
 class WallpaperPrivateSetCustomWallpaperLayoutFunction
@@ skipping 122 matching lines @@
   // Sends the list of files to extension api caller. If no files or no
   // directory, sends empty list.
   void OnComplete(const std::vector<std::string>& file_list);
 
   // Sequence token associated with wallpaper operations. Shared with
   // WallpaperManager.
   base::SequencedWorkerPool::SequenceToken sequence_token_;
 };
 
 #endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_WALLPAPER_PRIVATE_API_H_