Replace SetAuthenticatedUsername with SetAuthenticatedAccountId.

chrome/browser/signin/fake_signin_manager.h

Index: chrome/browser/signin/fake_signin_manager.h
diff --git a/chrome/browser/signin/fake_signin_manager.h b/chrome/browser/signin/fake_signin_manager.h
index 8e91531ac9891e567db29feee927ab04c8a2450d..24e59c41b479326332528cae4340aceb78903d8b 100644
--- a/chrome/browser/signin/fake_signin_manager.h
+++ b/chrome/browser/signin/fake_signin_manager.h
@@ -44,18 +44,21 @@ class FakeSigninManager : public SigninManager {
   explicit FakeSigninManager(Profile* profile);
   ~FakeSigninManager() override;
 
-  void set_auth_in_progress(const std::string& username) {
-    possibly_invalid_username_ = username;
+  void set_auth_in_progress(const std::string& account_id) {
+    possibly_invalid_account_id_ = account_id;
   }
 
   void set_password(const std::string& password) { password_ = password; }
 
-  void SignIn(const std::string& username, const std::string& password);
+  void SignIn(const std::string& account_id,
+              const std::string& username,
+              const std::string& password);
 
   void FailSignin(const GoogleServiceAuthError& error);
 
   void StartSignInWithRefreshToken(
       const std::string& refresh_token,
+      const std::string& gaia_id,
       const std::string& username,
       const std::string& password,
       const OAuthTokenFetchedCallback& oauth_fetched_callback) override;
@@ -63,6 +66,9 @@ class FakeSigninManager : public SigninManager {
   void SignOut(signin_metrics::ProfileSignout signout_source_metric) override;
 
   void CompletePendingSignin() override;
+
+  // Username specified in StartSignInWithRefreshToken() call.
+  std::string username_;
 };
 
 #endif  // !defined (OS_CHROMEOS)