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

chrome/browser/extensions/api/screenlock_private/screenlock_private_apitest.cc

 // 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.
 
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/api/screenlock_private/screenlock_private_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
@@ skipping 38 matching lines @@
 #endif
   }
 
   void SetUpOnMainThread() override {
     SigninManagerFactory::GetForProfile(profile())
         ->SetAuthenticatedAccountInfo(kTestGaiaId, kTestUser);
     ProfileInfoCache& info_cache =
         g_browser_process->profile_manager()->GetProfileInfoCache();
     size_t index = info_cache.GetIndexOfProfileWithPath(profile()->GetPath());
     ASSERT_NE(std::string::npos, index);
-    info_cache.SetAuthInfoOfProfileAtIndex(index, kTestGaiaId,
-                                           base::UTF8ToUTF16(kTestUser));
+    info_cache.SetAuthInfoOfProfileAtIndex(
+        index, kTestGaiaId, base::UTF8ToUTF16(test_account_id_.GetUserEmail()));
     ExtensionApiTest::SetUpOnMainThread();
   }
 
  protected:
   // ExtensionApiTest override:
   void RunTestOnMainThreadLoop() override {
     registrar_.Add(this,
                    extensions::NOTIFICATION_EXTENSION_TEST_MESSAGE,
                    content::NotificationService::AllSources());
     ExtensionApiTest::RunTestOnMainThreadLoop();
     registrar_.RemoveAll();
   }
 
   // content::NotificationObserver override:
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override {
     const std::string& content = *content::Details<std::string>(details).ptr();
     if (content == kAttemptClickAuthMessage) {
       proximity_auth::ScreenlockBridge::Get()->lock_handler()->SetAuthType(
-          kTestUser, proximity_auth::ScreenlockBridge::LockHandler::USER_CLICK,
+          test_account_id_,
+          proximity_auth::ScreenlockBridge::LockHandler::USER_CLICK,
           base::string16());
-      EasyUnlockService::Get(profile())->AttemptAuth(kTestUser);
+      EasyUnlockService::Get(profile())->AttemptAuth(test_account_id_);
     }
   }
 
   // Loads |extension_name| and waits for a pass / fail notification.
   void RunTest(const std::string& extension_name) {
     ASSERT_TRUE(RunComponentExtensionTest(extension_name)) << message_;
   }
 
  private:
+  const AccountId test_account_id_ =
+      AccountId::FromUserEmailGaiaId(kTestUser, kTestGaiaId);
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenlockPrivateApiTest);
 };
 
 // Locking is currently implemented only on ChromeOS.
 #if defined(OS_CHROMEOS)
 
 // Flaky under MSan. http://crbug.com/478091
 #if defined(MEMORY_SANITIZER)
 #define MAYBE_LockUnlock DISABLED_LockUnlock
 #else
 #define MAYBE_LockUnlock LockUnlock
 #endif
 
 IN_PROC_BROWSER_TEST_F(ScreenlockPrivateApiTest, MAYBE_LockUnlock) {
   RunTest("screenlock_private/lock_unlock");
 }
 
 IN_PROC_BROWSER_TEST_F(ScreenlockPrivateApiTest, AuthType) {
   RunTest("screenlock_private/auth_type");
 }
 
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace extensions