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

chrome/browser/extensions/api/screenlock_private/screenlock_private_api.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_EXTENSIONS_API_SCREENLOCK_PRIVATE_SCREENLOCK_PRIVATE_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_SCREENLOCK_PRIVATE_SCREENLOCK_PRIVATE_API_H_
 
 #include <string>
 
 #include "chrome/browser/extensions/chrome_extension_function.h"
@@ skipping 49 matching lines @@
 
   bool OnAuthAttempted(
       proximity_auth::ScreenlockBridge::LockHandler::AuthType auth_type,
       const std::string& value);
 
   // BrowserContextKeyedAPI
   static BrowserContextKeyedAPIFactory<ScreenlockPrivateEventRouter>*
   GetFactoryInstance();
   void Shutdown() override;
 
+ private:
+  friend class BrowserContextKeyedAPIFactory<ScreenlockPrivateEventRouter>;
+
   // proximity_auth::ScreenlockBridge::Observer
   void OnScreenDidLock(proximity_auth::ScreenlockBridge::LockHandler::ScreenType
                            screen_type) override;
   void OnScreenDidUnlock(
       proximity_auth::ScreenlockBridge::LockHandler::ScreenType screen_type)
       override;
-  void OnFocusedUserChanged(const std::string& user_id) override;
-
- private:
-  friend class BrowserContextKeyedAPIFactory<ScreenlockPrivateEventRouter>;
+  void OnFocusedUserChanged(const AccountId& account_id) override;
 
   // BrowserContextKeyedAPI
   static const char* service_name() {
     return "ScreenlockPrivateEventRouter";
   }
   static const bool kServiceIsNULLWhileTesting = true;
   static const bool kServiceRedirectedInIncognito = true;
 
   void DispatchEvent(events::HistogramValue histogram_value,
                      const std::string& event_name,
                      base::Value* arg);
 
   content::BrowserContext* browser_context_;
   DISALLOW_COPY_AND_ASSIGN(ScreenlockPrivateEventRouter);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_SCREENLOCK_PRIVATE_SCREENLOCK_PRIVATE_API_H_