Replace SetAuthenticatedUsername with SetAuthenticatedAccountId.

components/signin/core/browser/account_tracker_service.cc

 // Copyright 2014 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 "components/signin/core/browser/account_tracker_service.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
@@ skipping 566 matching lines @@
       return (email.find('@') == std::string::npos) ? email :
           gaia::CanonicalizeEmail(email);
     case MIGRATION_DONE:
       return gaia;
     default:
       NOTREACHED();
       return email;
   }
 }
 
-void AccountTrackerService::SeedAccountInfo(const std::string& gaia,
-                                            const std::string& email) {
-  DVLOG(1) << "AccountTrackerService::SeedAccountInfo"
-           << " gaia_id=" << gaia
-           << " email=" << email;
-
+std::string AccountTrackerService::SeedAccountInfo(const std::string& gaia,
+                                                   const std::string& email) {
   DCHECK(!gaia.empty());
   DCHECK(!email.empty());
   const std::string account_id = PickAccountIdForAccount(gaia, email);
   const bool already_exists = ContainsKey(accounts_, account_id);
   StartTrackingAccount(account_id);
   AccountState& state = accounts_[account_id];
   DCHECK(!already_exists || state.info.gaia == gaia);
   state.info.gaia = gaia;
   state.info.email = email;
   SaveToPrefs(state);
+
+  DVLOG(1) << "AccountTrackerService::SeedAccountInfo"
+           << " account_id=" << account_id
+           << " gaia_id=" << gaia
+           << " email=" << email;
+
+  return account_id;

[Mike Lerman, 2015/04/08 14:45:27]

Thought: Is it worth setting a class variable in the AccountTrackerService
called "picked_account_id_" that's set after SeedAccountInfo is called, such
that calls to PickAccountIdForAccount and SeedAccountInfo can return a const
std::string&, and make PickAccountIdForAccount more efficient?

Might not be worth the code to save a few operations, but just a thought.

[Roger Tawa OOO till Jul 10th, 2015/04/08 20:24:21]

I don't think it's worth it.  SeedAccountInfo is called only during the sign in
process, which means it is very rarely called.

 }