Clear GAIA profile picture URL when signing out

chrome/browser/profiles/gaia_info_update_service.cc

 // Copyright (c) 2011 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 "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
@@ skipping 95 matching lines @@
   std::string picture_url = downloader->GetProfilePictureURL();
   profile_image_downloader_.reset();
 
   ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
   size_t profile_index = cache.GetIndexOfProfileWithPath(profile_->GetPath());
   if (profile_index == std::string::npos)
     return;
 
   cache.SetGAIANameOfProfileAtIndex(profile_index, full_name);
+  // The profile index may have changed.
+  profile_index = cache.GetIndexOfProfileWithPath(profile_->GetPath());
+  if (profile_index == std::string::npos)
+    return;
   if (picture_status == ProfileDownloader::PICTURE_SUCCESS) {
     profile_->GetPrefs()->SetString(prefs::kProfileGAIAInfoPictureURL,
                                     picture_url);
     gfx::Image gfx_image(new SkBitmap(bitmap));
     cache.SetGAIAPictureOfProfileAtIndex(profile_index, &gfx_image);
   } else if (picture_status == ProfileDownloader::PICTURE_DEFAULT) {
     cache.SetGAIAPictureOfProfileAtIndex(profile_index, NULL);
   }
 
   // If this profile hasn't switched to using GAIA information for the profile
@@ skipping 24 matching lines @@
       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, 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::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);
 }