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

chrome/browser/signin/chrome_proximity_auth_client.cc

 // Copyright 2015 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 "chrome/browser/signin/chrome_proximity_auth_client.h"
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/sys_info.h"
 #include "base/version.h"
@@ skipping 60 matching lines @@
     base::Callback<void(const std::string& challenge)> callback) {
 #if defined(OS_CHROMEOS)
   EasyUnlockService* easy_unlock_service = EasyUnlockService::Get(profile_);
   if (easy_unlock_service->GetType() == EasyUnlockService::TYPE_REGULAR) {
     PA_LOG(ERROR) << "Unable to get challenge when user is logged in.";
     callback.Run(std::string());
     return;
   }
 
   static_cast<EasyUnlockServiceSignin*>(easy_unlock_service)
-      ->WrapChallengeForUserAndDevice(user_id, remote_public_key,
-                                      channel_binding_data, callback);
+      ->WrapChallengeForUserAndDevice(AccountId::FromUserEmail(user_id),
+                                      remote_public_key, channel_binding_data,
+                                      callback);
 #else
   callback.Run(std::string());
 #endif
 }
 
 PrefService* ChromeProximityAuthClient::GetPrefService() {
   return profile_->GetPrefs();
 }
 
 scoped_ptr<proximity_auth::SecureMessageDelegate>
@@ skipping 60 matching lines @@
 }
 
 EasyUnlockServiceRegular*
 ChromeProximityAuthClient::GetEasyUnlockServiceRegular() {
   EasyUnlockService* easy_unlock_service = EasyUnlockService::Get(profile_);
   if (easy_unlock_service->GetType() == EasyUnlockService::TYPE_REGULAR)
     return static_cast<EasyUnlockServiceRegular*>(easy_unlock_service);
   else
     return nullptr;
 }