ProfileInfoCache: Don't delete ProfileAvatarDownloader while we're being called by it

chrome/browser/profiles/profile_info_cache_unittest.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/profile_info_cache_unittest.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
@@ skipping 553 matching lines @@
       kIconIndex, GetCache()->GetPathOfProfileAtIndex(0), GetCache());
 
   // Put a real bitmap into "bitmap".  2x2 bitmap of green 32 bit pixels.
   SkBitmap bitmap;
   bitmap.allocN32Pixels(2, 2);
   bitmap.eraseColor(SK_ColorGREEN);
 
   avatar_downloader.OnFetchComplete(
       GURL("http://www.google.com/avatar.png"), &bitmap);
 
+  // Now the download should not be in progress anymore.
+  EXPECT_EQ(0U, GetCache()->avatar_images_downloads_in_progress_.size());
+
   std::string file_name =
       profiles::GetDefaultAvatarIconFileNameAtIndex(kIconIndex);
 
   // The file should have been cached and saved.
-  EXPECT_EQ(1U, GetCache()->avatar_images_downloads_in_progress_.size());
   EXPECT_EQ(1U, GetCache()->cached_avatar_images_.size());
   EXPECT_TRUE(GetCache()->GetHighResAvatarOfProfileAtIndex(0));
   EXPECT_EQ(GetCache()->cached_avatar_images_[file_name],
       GetCache()->GetHighResAvatarOfProfileAtIndex(0));
 
   // Make sure everything has completed, and the file has been written to disk.
   base::RunLoop().RunUntilIdle();
 
   // Clean up.
   base::FilePath icon_path =
@@ skipping 81 matching lines @@
   // Profile names should have been preserved.
   EXPECT_EQ(name_1, GetCache()->GetNameOfProfileAtIndex(
       GetCache()->GetIndexOfProfileWithPath(path_1)));
   EXPECT_EQ(name_2, GetCache()->GetNameOfProfileAtIndex(
       GetCache()->GetIndexOfProfileWithPath(path_2)));
   EXPECT_EQ(name_3, GetCache()->GetNameOfProfileAtIndex(
       GetCache()->GetIndexOfProfileWithPath(path_3)));
   EXPECT_EQ(name_4, GetCache()->GetNameOfProfileAtIndex(
       GetCache()->GetIndexOfProfileWithPath(path_4)));
 }