Make sure avatar menu does not use account_id for display purposes.

components/signin/core/browser/account_tracker_service.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.
 
 #ifndef COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_TRACKER_SERVICE_H_
 #define COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_TRACKER_SERVICE_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 85 matching lines @@
 
   struct AccountState {
     AccountInfo info;
   };
 
   void NotifyAccountUpdated(const AccountState& state);
   void NotifyAccountRemoved(const AccountState& state);
 
   void StartTrackingAccount(const std::string& account_id);
   void StopTrackingAccount(const std::string& account_id);
-  void StartFetchingUserInfo(const std::string& account_id);
+
+  // Virtual so that tests can override the network fetching behaviour.
+  virtual void StartFetchingUserInfo(const std::string& account_id);
   void DeleteFetcher(AccountInfoFetcher* fetcher);
 
   // Load the current state of the account info from the preferences file.
   void LoadFromPrefs();
   void SaveToPrefs(const AccountState& account);
   void RemoveFromPrefs(const AccountState& account);
 
   void LoadFromTokenService();
 
   OAuth2TokenService* token_service_;  // Not owned.
   PrefService* pref_service_;  // Not owned.
   scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
   std::map<std::string, AccountInfoFetcher*> user_info_requests_;
   std::map<std::string, AccountState> accounts_;
   ObserverList<Observer> observer_list_;
   bool shutdown_called_;
 
   DISALLOW_COPY_AND_ASSIGN(AccountTrackerService);
 };
 
 #endif  // COMPONENTS_SIGNIN_CORE_BROWSER_ACCOUNT_TRACKER_SERVICE_H_