Fix DCHECK when upgrading from an old profile.

chrome/browser/signin/signin_promo.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 "chrome/browser/signin/signin_promo.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 164 matching lines @@
   std::string url(chrome::kChromeUIChromeSigninURL);
   base::StringAppendF(&url, "?%s=%d", kSignInPromoQueryKeySource, source);
   if (auto_close)
     base::StringAppendF(&url, "&%s=1", kSignInPromoQueryKeyAutoClose);
   if (is_constrained)
     base::StringAppendF(&url, "&%s=1", kSignInPromoQueryKeyConstrained);
   return GURL(url);
 }
 
 GURL GetReauthURL(Profile* profile, const std::string& account_id) {
+  AccountTrackerService* account_tracker =
+      AccountTrackerServiceFactory::GetForProfile(profile);
   AccountTrackerService::AccountInfo info =
-      AccountTrackerServiceFactory::GetForProfile(profile)->
-          GetAccountInfo(account_id);
+      account_tracker->GetAccountInfo(account_id);
+
+  // Until we switch to gaia id as the account id, we'll assume we can use the
+  // account_id as an email.  This DCHECK makes sure this code is not forgotten
+  // during the migration.
+  DCHECK(!info.email.empty() ||
+      (account_tracker->GetMigrationState() ==
+           AccountTrackerService::MIGRATION_NOT_STARTED));
+  std::string email = info.email.empty() ? account_id : info.email;
 
   signin_metrics::Source source = switches::IsNewAvatarMenu() ?
       signin_metrics::SOURCE_REAUTH : signin_metrics::SOURCE_SETTINGS;
 
   GURL url = signin::GetPromoURL(
       source, true /* auto_close */,
       switches::IsNewAvatarMenu() /* is_constrained */);
-  url = net::AppendQueryParameter(url, "email", info.email);
+  url = net::AppendQueryParameter(url, "email", email);
   url = net::AppendQueryParameter(url, "validateEmail", "1");
   return net::AppendQueryParameter(url, "readOnlyEmail", "1");
 }
 
 GURL GetNextPageURLForPromoURL(const GURL& url) {
   std::string value;
   if (net::GetValueForKeyInQuery(url, kSignInPromoQueryKeyContinue, &value)) {
     GURL continue_url = GURL(value);
     if (continue_url.is_valid())
       return continue_url;
@@ skipping 58 matching lines @@
       prefs::kSignInPromoShowOnFirstRunAllowed,
       true,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterBooleanPref(
       prefs::kSignInPromoShowNTPBubble,
       false,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 }  // namespace signin