Replace SetAuthenticatedUsername with SetAuthenticatedAccountId.

chrome/browser/signin/signin_ui_util.cc

 // Copyright (c) 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 "chrome/browser/signin/signin_ui_util.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 143 matching lines @@
       }
       break;
   }
 }
 
 void InitializePrefsForProfile(Profile* profile) {
   // Suppresses the upgrade tutorial for a new profile.
   if (profile->IsNewProfile() && switches::IsNewAvatarMenu()) {
     profile->GetPrefs()->SetInteger(
         prefs::kProfileAvatarTutorialShown, kUpgradeWelcomeTutorialShowMax + 1);
+#ifdef NOT_YET_MON_BOY

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

Ummmm... is this supposed to be here?

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

Oops, that was never meant for other humans to see :-)

+    profile->GetPrefs()->SetInteger(
+        prefs::kAccountIdMigrationState, AccountTrackerService::MIGRATION_DONE);
+#endif
   }
 }
 
 void ShowSigninErrorLearnMorePage(Profile* profile) {
   static const char kSigninErrorLearnMoreUrl[] =
       "https://support.google.com/chrome/answer/1181420?";
   chrome::NavigateParams params(
       profile, GURL(kSigninErrorLearnMoreUrl), ui::PAGE_TRANSITION_LINK);
   params.disposition = NEW_FOREGROUND_TAB;
   chrome::Navigate(&params);
 }
 
 std::string GetDisplayEmail(Profile* profile, const std::string& account_id) {
   AccountTrackerService* account_tracker =
       AccountTrackerServiceFactory::GetForProfile(profile);
   std::string email = account_tracker->GetAccountInfo(account_id).email;
   if (email.empty()) {
     DCHECK_EQ(AccountTrackerService::MIGRATION_NOT_STARTED,
               account_tracker->GetMigrationState());
     return account_id;
   }
   return email;
 }
 
 }  // namespace signin_ui_util