Just some cleanup before I start on the profile name fix.

chrome/browser/profiles/gaia_info_update_service.h

 // Copyright (c) 2012 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 CHROME_BROWSER_PROFILES_GAIA_INFO_UPDATE_SERVICE_H_
 #define CHROME_BROWSER_PROFILES_GAIA_INFO_UPDATE_SERVICE_H_
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/prefs/pref_member.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/profiles/profile_downloader.h"
 #include "chrome/browser/profiles/profile_downloader_delegate.h"
 #include "components/keyed_service/core/keyed_service.h"
+#include "components/signin/core/browser/signin_manager.h"
 
 class Profile;
 class ProfileDownloader;
 
 // This service kicks off a download of the user's name and profile picture.
 // The results are saved in the profile info cache.
-class GAIAInfoUpdateService : public ProfileDownloaderDelegate,
-                              public KeyedService {
+class GAIAInfoUpdateService : public KeyedService,
+                              public ProfileDownloaderDelegate,
+                              public SigninManagerBase::Observer {
  public:
   explicit GAIAInfoUpdateService(Profile* profile);
   virtual ~GAIAInfoUpdateService();
 
   // Updates the GAIA info for the profile associated with this instance.
   virtual void Update();
 
   // Checks if downloading GAIA info for the given profile is allowed.
   static bool ShouldUseGAIAProfileInfo(Profile* profile);
 
   // ProfileDownloaderDelegate:
   virtual bool NeedsProfilePicture() const OVERRIDE;
   virtual int GetDesiredImageSideLength() const OVERRIDE;
   virtual Profile* GetBrowserProfile() OVERRIDE;
   virtual std::string GetCachedPictureURL() const OVERRIDE;
   virtual void OnProfileDownloadSuccess(ProfileDownloader* downloader) OVERRIDE;
   virtual void OnProfileDownloadFailure(
       ProfileDownloader* downloader,
       ProfileDownloaderDelegate::FailureReason reason) OVERRIDE;
 
+  // Overridden from KeyedService:
+  virtual void Shutdown() OVERRIDE;
+
  private:
   FRIEND_TEST_ALL_PREFIXES(GAIAInfoUpdateServiceTest, ScheduleUpdate);
 
-  void OnUsernameChanged();
+  void OnUsernameChanged(const std::string& username);
   void ScheduleNextUpdate();
 
+  // Overridden from SigninManagerBase::Observer:
+  virtual void GoogleSigninSucceeded(const std::string& username,
+                                     const std::string& password) OVERRIDE;
+  virtual void GoogleSignedOut(const std::string& username) OVERRIDE;
+
   Profile* profile_;
   scoped_ptr<ProfileDownloader> profile_image_downloader_;
-  StringPrefMember username_pref_;
   base::Time last_updated_;
   base::OneShotTimer<GAIAInfoUpdateService> timer_;
 
   DISALLOW_COPY_AND_ASSIGN(GAIAInfoUpdateService);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_GAIA_INFO_UPDATE_SERVICE_H_