Replace SetAuthenticatedUsername with SetAuthenticatedAccountId.

components/autofill/core/browser/personal_data_manager.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 "components/autofill/core/browser/personal_data_manager.h"
 
 #include <algorithm>
 #include <functional>
 #include <iterator>
 
@@ skipping 12 matching lines @@
 #include "components/autofill/core/browser/autofill_experiments.h"
 #include "components/autofill/core/browser/autofill_field.h"
 #include "components/autofill/core/browser/autofill_metrics.h"
 #include "components/autofill/core/browser/form_structure.h"
 #include "components/autofill/core/browser/personal_data_manager_observer.h"
 #include "components/autofill/core/browser/phone_number.h"
 #include "components/autofill/core/browser/phone_number_i18n.h"
 #include "components/autofill/core/browser/validation.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/autofill/core/common/autofill_switches.h"
+#include "components/signin/core/browser/account_tracker_service.h"
 #include "components/signin/core/common/signin_pref_names.h"
 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_data.h"
 #include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_formatter.h"
 
 namespace autofill {
 namespace {
 
 using ::i18n::addressinput::AddressField;
 using ::i18n::addressinput::GetStreetAddressLinesAsSingleLine;
 using ::i18n::addressinput::STREET_ADDRESS;
@@ skipping 191 matching lines @@
 
 PersonalDataManager::PersonalDataManager(const std::string& app_locale)
     : database_(NULL),
       is_data_loaded_(false),
       pending_profiles_query_(0),
       pending_server_profiles_query_(0),
       pending_creditcards_query_(0),
       pending_server_creditcards_query_(0),
       app_locale_(app_locale),
       pref_service_(NULL),
+      account_tracker_(NULL),
       is_off_the_record_(false),
       has_logged_profile_count_(false) {}
 
 void PersonalDataManager::Init(scoped_refptr<AutofillWebDataService> database,
                                PrefService* pref_service,
+                               AccountTrackerService* account_tracker,
                                bool is_off_the_record) {
   database_ = database;
+  account_tracker_ = account_tracker;
   SetPrefService(pref_service);

[Evan Stade, 2015/04/10 13:56:15]

nit: keep init in order of parameters?

[Roger Tawa OOO till Jul 10th, 2015/04/10 14:35:33]

Done.

   is_off_the_record_ = is_off_the_record;
 
   if (!is_off_the_record_)
     AutofillMetrics::LogIsAutofillEnabledAtStartup(IsAutofillEnabled());
 
   // WebDataService may not be available in tests.
   if (!database_.get())
     return;
 
   LoadProfiles();
@@ skipping 37 matching lines @@
     case AUTOFILL_PROFILES_RESULT:
       if (h == pending_profiles_query_) {
         ReceiveLoadedDbValues(h, result, &pending_profiles_query_,
                               &web_profiles_);
         LogProfileCount();  // This only logs local profiles.
       } else {
         ReceiveLoadedDbValues(h, result, &pending_server_profiles_query_,
                               &server_profiles_);
 
         if (!server_profiles_.empty()) {
-          base::string16 email = base::UTF8ToUTF16(
-              pref_service_->GetString(::prefs::kGoogleServicesUsername));
+          std::string account_id =
+              pref_service_->GetString(::prefs::kGoogleServicesAccountId);
+          base::string16 email =
+              base::UTF8ToUTF16(
+                  account_tracker_->GetAccountInfo(account_id).email);
           DCHECK(!email.empty());
           for (AutofillProfile* profile : server_profiles_)
             profile->SetRawInfo(EMAIL_ADDRESS, email);
         }
       }
       break;
     case AUTOFILL_CREDITCARDS_RESULT:
       if (h == pending_creditcards_query_) {
         ReceiveLoadedDbValues(h, result, &pending_creditcards_query_,
                               &local_credit_cards_);
@@ skipping 1072 matching lines @@
   }
   if (IsExperimentalWalletIntegrationEnabled() &&
       pref_service_->GetBoolean(prefs::kAutofillWalletImportEnabled)) {
     profiles_.insert(
         profiles_.end(), server_profiles_.begin(), server_profiles_.end());
   }
   return profiles_;
 }
 
 }  // namespace autofill