Replace SetAuthenticatedUsername with SetAuthenticatedAccountId.

components/autofill/core/browser/personal_data_manager.h

 // 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.
 
 #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_PERSONAL_DATA_MANAGER_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_PERSONAL_DATA_MANAGER_H_
 
 #include <set>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/observer_list.h"
 #include "base/prefs/pref_member.h"
 #include "base/strings/string16.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/suggestion.h"
 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/autofill/core/browser/webdata/autofill_webdata_service_observer.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/webdata/common/web_data_service_consumer.h"
 
 class Browser;
 class PrefService;
 class RemoveAutofillTester;
+class AccountTrackerService;
 
 namespace autofill {
 class AutofillInteractiveTest;
 class AutofillTest;
 class FormStructure;
 class PersonalDataManagerObserver;
 class PersonalDataManagerFactory;
 }  // namespace autofill
 
 namespace autofill_helper {
@@ skipping 12 matching lines @@
  public:
   explicit PersonalDataManager(const std::string& app_locale);
   ~PersonalDataManager() override;
 
   // Kicks off asynchronous loading of profiles and credit cards.
   // |pref_service| must outlive this instance.  |is_off_the_record| informs
   // this instance whether the user is currently operating in an off-the-record
   // context.
   void Init(scoped_refptr<AutofillWebDataService> database,
             PrefService* pref_service,
+            AccountTrackerService* account_tracker,

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

this is only used for one purpose --- to get the signed in account email
address. It might be simpler to just pass that email address in, as I'm not sure
we'll ever need the AccountTrackerService for anything else.

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

If the user signs in or out, this email would need to be refreshed.  So we could
pass the current email here, but then PersonalDataManager would need to listen
for account id changes and then retrieve the new email.

I was going to just retrieve the account tracker from inside
OnWebDataServiceRequestDone(), but that's not possible because this is a
component, hence no access to the factory.

So it seems simplest as is:  pass in the account tracker, then
OnWebDataServiceRequestDone() can get the current account id as needed.  Did I
miss anything?

             bool is_off_the_record);
 
   // WebDataServiceConsumer:
   void OnWebDataServiceRequestDone(WebDataServiceBase::Handle h,
                                    const WDTypedResult* result) override;
 
   // AutofillWebDataServiceObserverOnUIThread:
   void AutofillMultipleChanged() override;
 
   // Adds a listener to be notified of PersonalDataManager events.
@@ skipping 231 matching lines @@
   virtual std::string CountryCodeForCurrentTimezone() const;
 
   // Sets which PrefService to use and observe. |pref_service| is not owned by
   // this class and must outlive |this|.
   void SetPrefService(PrefService* pref_service);
 
   void set_database(scoped_refptr<AutofillWebDataService> database) {
     database_ = database;
   }
 
+  void set_account_tracker(AccountTrackerService* account_tracker) {
+    account_tracker_ = account_tracker;
+  }
+
   // The backing database that this PersonalDataManager uses.
   scoped_refptr<AutofillWebDataService> database_;
 
   // True if personal data has been loaded from the web database.
   bool is_data_loaded_;
 
   // The loaded web profiles. These are constructed from entries on web pages
   // and from manually editing in the settings.
   ScopedVector<AutofillProfile> web_profiles_;
 
@@ skipping 43 matching lines @@
       bool record_metrics) const;
 
   const std::string app_locale_;
 
   // The default country code for new addresses.
   mutable std::string default_country_code_;
 
   // The PrefService that this instance uses. Must outlive this instance.
   PrefService* pref_service_;
 
+  // The AccountTrackerService that this instance uses. Must outlive this
+  // instance.
+  AccountTrackerService* account_tracker_;
+
   // Whether the user is currently operating in an off-the-record context.
   // Default value is false.
   bool is_off_the_record_;
 
   // Whether we have already logged the number of profiles this session.
   mutable bool has_logged_profile_count_;
 
   // An observer to listen for changes to prefs::kAutofillEnabled.
   scoped_ptr<BooleanPrefMember> enabled_pref_;
 
   // An observer to listen for changes to prefs::kAutofillWalletImportEnabled.
   scoped_ptr<BooleanPrefMember> wallet_enabled_pref_;
 
   DISALLOW_COPY_AND_ASSIGN(PersonalDataManager);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_PERSONAL_DATA_MANAGER_H_