This CL replaces user_manager::UserID with AccountId.

chrome/browser/ui/webui/options/chromeos/user_image_source.h

Index: chrome/browser/ui/webui/options/chromeos/user_image_source.h
diff --git a/chrome/browser/ui/webui/options/chromeos/user_image_source.h b/chrome/browser/ui/webui/options/chromeos/user_image_source.h
index ad11d6ada99bf08677de41ef81aee63083e5e448..92737537894a7ced7b44b93db2345d2aa80cf841 100644
--- a/chrome/browser/ui/webui/options/chromeos/user_image_source.h
+++ b/chrome/browser/ui/webui/options/chromeos/user_image_source.h
@@ -13,6 +13,8 @@
 #include "content/public/browser/url_data_source.h"
 #include "ui/base/layout.h"
 
+class AccountId;
+
 namespace base {
 class RefCountedMemory;
 }
@@ -35,9 +37,9 @@ class UserImageSource : public content::URLDataSource {
       const content::URLDataSource::GotDataCallback& callback) override;
   std::string GetMimeType(const std::string& path) const override;
 
-  // Returns PNG encoded image for user with specified email. If there's
-  // no user with such email, returns the first default image.
-  static base::RefCountedMemory* GetUserImage(const std::string& email,
+  // Returns PNG encoded image for user with specified |account_id|. If there's
+  // no user with such id, returns the first default image.

[achuithb, 2015/10/28 23:11:46]

s/id/an id/

[Alexander Alekseev, 2015/10/29 02:00:42]

Done.

+  static base::RefCountedMemory* GetUserImage(const AccountId& account_id,
                                               ui::ScaleFactor scale_factor);
 
  private: