This CL replaces e-mail with AccountId in easy signin code.

chrome/browser/ui/webui/signin/user_manager_screen_handler.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_SIGNIN_USER_MANAGER_SCREEN_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_SIGNIN_USER_MANAGER_SCREEN_HANDLER_H_
 
 #include <map>
 #include <string>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/profiles/profile_statistics.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "components/proximity_auth/screenlock_bridge.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "google_apis/gaia/gaia_oauth_client.h"
 
+class AccountId;
 class GaiaAuthFetcher;
 
 namespace base {
 class DictionaryValue;
 class FilePath;
 class ListValue;
 }
 
 class UserManagerScreenHandler
     : public content::WebUIMessageHandler,
       public proximity_auth::ScreenlockBridge::LockHandler,
       public gaia::GaiaOAuthClient::Delegate,
       public content::NotificationObserver {
  public:
   UserManagerScreenHandler();
   ~UserManagerScreenHandler() override;
 
+  void GetLocalizedValues(base::DictionaryValue* localized_strings);
+
+ private:
+  // An observer for any changes to Profiles in the ProfileInfoCache so that
+  // all the visible user manager screens can be updated.
+  class ProfileUpdateObserver;
+
   // WebUIMessageHandler implementation.
   void RegisterMessages() override;
 
-  void GetLocalizedValues(base::DictionaryValue* localized_strings);
-
   // content::NotificationObserver implementation:
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
   // proximity_auth::ScreenlockBridge::LockHandler implementation.
   void ShowBannerMessage(const base::string16& message) override;
   void ShowUserPodCustomIcon(
-      const std::string& user_email,
+      const AccountId& account_id,
       const proximity_auth::ScreenlockBridge::UserPodCustomIconOptions&
           icon_options) override;
-  void HideUserPodCustomIcon(const std::string& user_email) override;
+  void HideUserPodCustomIcon(const AccountId& account_id) override;
   void EnableInput() override;
   void SetAuthType(
-      const std::string& user_email,
+      const AccountId& account_id,
       proximity_auth::ScreenlockBridge::LockHandler::AuthType auth_type,
       const base::string16& auth_value) override;
-  AuthType GetAuthType(const std::string& user_email) const override;
+  AuthType GetAuthType(const AccountId& account_id) const override;
   ScreenType GetScreenType() const override;
-  void Unlock(const std::string& user_email) override;
-  void AttemptEasySignin(const std::string& user_email,
+  void Unlock(const AccountId& account_id) override;
+  void AttemptEasySignin(const AccountId& account_id,
                          const std::string& secret,
                          const std::string& key_label) override;
 
- private:
-  // An observer for any changes to Profiles in the ProfileInfoCache so that
-  // all the visible user manager screens can be updated.
-  class ProfileUpdateObserver;
-
   void HandleInitialize(const base::ListValue* args);
   void HandleAddUser(const base::ListValue* args);
   void HandleAuthenticatedLaunchUser(const base::ListValue* args);
   void HandleLaunchGuest(const base::ListValue* args);
   void HandleLaunchUser(const base::ListValue* args);
   void HandleRemoveUser(const base::ListValue* args);
   void HandleAttemptUnlock(const base::ListValue* args);
   void HandleHardlockUserPod(const base::ListValue* args);
   void HandleRemoveUserWarningLoadStats(const base::ListValue* args);
   void HandleGetRemoveWarningDialogMessage(const base::ListValue* args);
@@ skipping 51 matching lines @@
 
   // The CancelableTaskTracker is currently used by GetProfileStatistics
   base::CancelableTaskTracker tracker_;
 
   base::WeakPtrFactory<UserManagerScreenHandler> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(UserManagerScreenHandler);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_SIGNIN_USER_MANAGER_SCREEN_HANDLER_H_