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

chrome/browser/profiles/gaia_info_update_service.cc

 // 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.
 
 #include "chrome/browser/profiles/gaia_info_update_service.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/profile_management_switches.h"
 #include "content/public/browser/notification_details.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/image/image.h"
 
 namespace {
 
 // Update the user's GAIA info every 24 hours.
 const int kUpdateIntervalHours = 24;
 
 // If the users's GAIA info is very out of date then wait at least this long
 // before starting an update. This avoids slowdown during startup.
 const int kMinUpdateIntervalSeconds = 5;
 
 } // namespace
 
 GAIAInfoUpdateService::GAIAInfoUpdateService(Profile* profile)
     : profile_(profile) {
+  SigninManagerBase* signin_manager =
+      SigninManagerFactory::GetForProfile(profile_);
+  signin_manager->AddObserver(this);
+
   PrefService* prefs = profile_->GetPrefs();
-  username_pref_.Init(prefs::kGoogleServicesUsername, prefs,
-                      base::Bind(&GAIAInfoUpdateService::OnUsernameChanged,
-                                 base::Unretained(this)));
-
   last_updated_ = base::Time::FromInternalValue(
       prefs->GetInt64(prefs::kProfileGAIAInfoUpdateTime));
   ScheduleNextUpdate();
 }
 
 GAIAInfoUpdateService::~GAIAInfoUpdateService() {
+  DCHECK(!profile_) << "Shutdown not called before dtor";
 }
 
 void GAIAInfoUpdateService::Update() {
   // The user must be logged in.
-  std::string username = profile_->GetPrefs()->GetString(
-      prefs::kGoogleServicesUsername);
-  if (username.empty())
+  SigninManagerBase* signin_manager =
+      SigninManagerFactory::GetForProfile(profile_);
+  if (signin_manager->GetAuthenticatedAccountId().empty())
     return;
 
   if (profile_image_downloader_)
     return;
   profile_image_downloader_.reset(new ProfileDownloader(this));
   profile_image_downloader_->Start();
 }
 
 // static
 bool GAIAInfoUpdateService::ShouldUseGAIAProfileInfo(Profile* profile) {
@@ skipping 83 matching lines @@
     ProfileDownloaderDelegate::FailureReason reason) {
   profile_image_downloader_.reset();
 
   // Save the last updated time.
   last_updated_ = base::Time::Now();
   profile_->GetPrefs()->SetInt64(prefs::kProfileGAIAInfoUpdateTime,
                                  last_updated_.ToInternalValue());
   ScheduleNextUpdate();
 }
 
-void GAIAInfoUpdateService::OnUsernameChanged() {
+void GAIAInfoUpdateService::OnUsernameChanged(const std::string& username) {
   ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
   size_t profile_index = cache.GetIndexOfProfileWithPath(profile_->GetPath());
   if (profile_index == std::string::npos)
     return;
 
-  std::string username = profile_->GetPrefs()->GetString(
-      prefs::kGoogleServicesUsername);
   if (username.empty()) {
     // Unset the old user's GAIA info.
     cache.SetGAIANameOfProfileAtIndex(profile_index, base::string16());
     // The profile index may have changed.
     profile_index = cache.GetIndexOfProfileWithPath(profile_->GetPath());
     if (profile_index == std::string::npos)
       return;
     cache.SetGAIAPictureOfProfileAtIndex(profile_index, NULL);
     // Unset the cached URL.
     profile_->GetPrefs()->ClearPref(prefs::kProfileGAIAInfoPictureURL);
   } else {
     // Update the new user's GAIA info.
     Update();
   }
 }
 
+void GAIAInfoUpdateService::Shutdown() {
+  timer_.Stop();
+  profile_image_downloader_.reset();
+  SigninManagerBase* signin_manager =
+      SigninManagerFactory::GetForProfile(profile_);
+  signin_manager->RemoveObserver(this);
+
+  // OK to reset |profile_| pointer here because GAIAInfoUpdateService will not
+  // access it again.  This pointer is also used to implement the delegate for
+  // |profile_image_downloader_|.  However that object was destroyed above.
+  profile_ = NULL;
+}
+
 void GAIAInfoUpdateService::ScheduleNextUpdate() {
   if (timer_.IsRunning())
     return;
 
   const base::TimeDelta desired_delta =
       base::TimeDelta::FromHours(kUpdateIntervalHours);
   const base::TimeDelta update_delta = base::Time::Now() - last_updated_;
 
   base::TimeDelta delta;
   if (update_delta < base::TimeDelta() || update_delta > desired_delta)
     delta = base::TimeDelta::FromSeconds(kMinUpdateIntervalSeconds);
   else
     delta = desired_delta - update_delta;
 
   timer_.Start(FROM_HERE, delta, this, &GAIAInfoUpdateService::Update);
 }
+
+void GAIAInfoUpdateService::GoogleSigninSucceeded(
+    const std::string& username,
+    const std::string& password) {
+  OnUsernameChanged(username);
+}
+
+void GAIAInfoUpdateService::GoogleSignedOut(const std::string& username) {
+  OnUsernameChanged(std::string());
+}