Replace SetAuthenticatedUsername with SetAuthenticatedAccountId.

components/autofill/core/browser/autofill_test_utils.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/autofill_test_utils.h"
 
 #include "base/guid.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/pref_service_factory.h"
 #include "base/prefs/testing_pref_store.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/browser/webdata/autofill_table.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "components/os_crypt/os_crypt.h"
 #include "components/pref_registry/pref_registry_syncable.h"
+#include "components/signin/core/browser/account_tracker_service.h"
 #include "components/signin/core/common/signin_pref_names.h"
 
 using base::ASCIIToUTF16;
 
 namespace autofill {
 namespace test {
 
 namespace {
 
 const char kSettingsOrigin[] = "Chrome settings";
 
 }  // namespace
 
 scoped_ptr<PrefService> PrefServiceForTesting() {
   scoped_refptr<user_prefs::PrefRegistrySyncable> registry(
       new user_prefs::PrefRegistrySyncable());
   AutofillManager::RegisterProfilePrefs(registry.get());
 
   // PDM depends on this pref, which is normally registered in
   // SigninManagerFactory.
   registry->RegisterStringPref(
-      ::prefs::kGoogleServicesUsername, std::string(),
+      ::prefs::kGoogleServicesAccountId, std::string(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+
+  // PDM depends on these prefs, which are normally registered in
+  // AccountTrackerServiceFactory.
+  registry->RegisterListPref(
+      AccountTrackerService::kAccountInfoPref,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterIntegerPref(
+      ::prefs::kAccountIdMigrationState,
+      AccountTrackerService::MIGRATION_NOT_STARTED,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+
   base::PrefServiceFactory factory;
   factory.set_user_prefs(make_scoped_refptr(new TestingPrefStore()));
   return factory.Create(registry.get());
 }
 
 void CreateTestFormField(const char* label,
                          const char* name,
                          const char* value,
                          const char* type,
                          FormFieldData* field) {
@@ skipping 243 matching lines @@
   for (const CreditCard& card : cards) {
     if (card.record_type() != CreditCard::FULL_SERVER_CARD)
       continue;
 
     table->UnmaskServerCreditCard(card, card.number());
   }
 }
 
 }  // namespace test
 }  // namespace autofill