Replace SetAuthenticatedUsername with SetAuthenticatedAccountId.

components/signin/core/browser/signin_manager_base.h

 // Copyright 2014 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.
 //
 // The signin manager encapsulates some functionality tracking
 // which user is signed in.
 //
 // **NOTE** on semantics of SigninManager:
 //
 // Once a signin is successful, the username becomes "established" and will not
@@ skipping 18 matching lines @@
 #include "base/gtest_prod_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "base/prefs/pref_member.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/signin/core/browser/signin_internals_util.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 
+class AccountTrackerService;
 class PrefService;
-
 class SigninClient;
 
 class SigninManagerBase : public KeyedService {
  public:
   class Observer {
    public:
     // Called when a user fails to sign into Google services such as sync.
     virtual void GoogleSigninFailed(const GoogleServiceAuthError& error) {}
 
     // Called when a user signs into Google services such as sync.
     virtual void GoogleSigninSucceeded(const std::string& account_id,
                                        const std::string& username,
                                        const std::string& password) {}
 
     // Called when the currently signed-in user for a user has been signed out.
     virtual void GoogleSignedOut(const std::string& account_id,

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

So at first I wasn't sure if account_id should still be called such when it's
partner is username. Apparently account_id is never referenced! Perhaps not in
this CL, but the account_id parameter can be removed from this function.

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

Eventually I think username should be removed, since all code should use
|account_id| as an index or key for accounts.  But this changes a public api
signin manager so definitely will be done in a separate CL.

                                  const std::string& username) {}
 
    protected:
     virtual ~Observer() {}
   };
 
-  SigninManagerBase(SigninClient* client);
+  SigninManagerBase(SigninClient* client,
+                    AccountTrackerService* account_tracker_service);
   ~SigninManagerBase() override;
 
   // If user was signed in, load tokens from DB if available.
   virtual void Initialize(PrefService* local_state);
   bool IsInitialized() const;
 
   // Returns true if a signin to Chrome is allowed (by policy or pref).
   // TODO(tim): kSigninAllowed is defined for all platforms in pref_names.h.
   // If kSigninAllowed pref was non-Chrome OS-only, this method wouldn't be
   // needed, but as is we provide this method to let all interested code
   // code query the value in one way, versus half using PrefService directly
   // and the other half using SigninManager.
   virtual bool IsSigninAllowed() const;
 
   // If a user has previously signed in (and has not signed out), this returns
   // the normalized email address of the account. Otherwise, it returns an empty
   // string.
-  const std::string& GetAuthenticatedUsername() const;
+  std::string GetAuthenticatedUsername() const;
 
   // If a user has previously signed in (and has not signed out), this returns
   // the account id. Otherwise, it returns an empty string.  This id can be used
   // to uniquely identify an account, so for example can be used as a key to
   // map accounts to data.
   //
   // TODO(rogerta): eventually the account id should be an obfuscated gaia id.
   // For now though, this function returns the same value as
   // GetAuthenticatedUsername() since lots of code assumes the unique id for an
   // account is the username.  For code that needs a unique id to represent the
   // connected account, call this method. Example: the AccountInfoMap type
   // in MutableProfileOAuth2TokenService.  For code that needs to know the
   // normalized email address of the connected account, use
   // GetAuthenticatedUsername().  Example: to show the string "Signed in as XXX"
   // in the hotdog menu.
   const std::string& GetAuthenticatedAccountId() const;
 
-  // Sets the user name.  Note: |username| should be already authenticated as
-  // this is a sticky operation (in contrast to StartSignIn).
-  // TODO(tim): Remove this in favor of passing username on construction by
-  // (by platform / depending on StartBehavior). Bug 88109.
-  void SetAuthenticatedUsername(const std::string& username);
+  // Sets the authenticated user's Gaia ID and display email.  Internally,
+  // this will seed the account information in AccountTrackerService and pick
+  // the right account_id for this account.
+  void SetAuthenticatedAccountInfo(const std::string& gaia_id,
+                                   const std::string& email);
 
   // Returns true if there is an authenticated user.
   bool IsAuthenticated() const;
 
   // Returns true if there's a signin in progress.
   virtual bool AuthInProgress() const;
 
   // KeyedService implementation.
   void Shutdown() override;
 
   // Methods to register or remove observers of signin.
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
   // Methods to register or remove SigninDiagnosticObservers.
   void AddSigninDiagnosticsObserver(
       signin_internals_util::SigninDiagnosticsObserver* observer);
   void RemoveSigninDiagnosticsObserver(
       signin_internals_util::SigninDiagnosticsObserver* observer);
 
  protected:
-  // Used by subclass to clear authenticated_username_ instead of using
-  // SetAuthenticatedUsername, which enforces special preconditions due
+  AccountTrackerService* account_tracker_service() const {
+    return account_tracker_service_;
+  }
+
+  // Sets the authenticated user's account id.
+  void SetAuthenticatedAccountId(const std::string& account_id);
+
+  // Used by subclass to clear the authenticated user instead of using
+  // SetAuthenticatedAccountId, which enforces special preconditions due
   // to the fact that it is part of the public API and called by clients.
-  void ClearAuthenticatedUsername();
+  void clear_authenticated_user();

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

Shouldn't hacker-style methods be inline? And perhaps call that
clear_authenticated_account_id().

Before you do this - see comment I left in the implementation.

 
   // List of observers to notify on signin events.
   // Makes sure list is empty on destruction.
   ObserverList<Observer, true> observer_list_;
 
   // Helper method to notify all registered diagnostics observers with.
   void NotifyDiagnosticsObservers(
       const signin_internals_util::TimedSigninStatusField& field,
       const std::string& value);
 
+  SigninClient* signin_client() const { return client_; }

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

nit [ignorable]: I don't know if this is style, but it's nice to group like
functions together. Perhaps put the accessors account_tracker_service() and
signin_client() next to each other?

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

Done.

+
  private:
   friend class FakeSigninManagerBase;
   friend class FakeSigninManager;
 
   SigninClient* client_;
+  AccountTrackerService* account_tracker_service_;
   bool initialized_;
 
-  // Actual username and account_id after successful authentication.
-  std::string authenticated_username_;
+  // Account id after successful authentication.
   std::string authenticated_account_id_;
 
   // The list of SigninDiagnosticObservers.
   ObserverList<signin_internals_util::SigninDiagnosticsObserver, true>
       signin_diagnostics_observers_;
 
   base::WeakPtrFactory<SigninManagerBase> weak_pointer_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SigninManagerBase);
 };
 
 #endif  // COMPONENTS_SIGNIN_CORE_BROWSER_SIGNIN_MANAGER_BASE_H_