Change default code flag to NewAvatarMenu.

chrome/test/base/testing_profile_manager.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/test/base/testing_profile_manager.h"
 
+#include "base/files/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
+#include "chrome/browser/profiles/profile_avatar_downloader.h"
+#include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #endif
 
@@ skipping 70 matching lines @@
 
   TestingProfile* profile = builder.Build().release();
   profile->set_profile_name(profile_name);
   profile_manager_->AddProfile(profile);  // Takes ownership.
 
   // Update the user metadata.
   ProfileInfoCache& cache = profile_manager_->GetProfileInfoCache();
   size_t index = cache.GetIndexOfProfileWithPath(profile_path);
   cache.SetAvatarIconOfProfileAtIndex(index, avatar_id);
   cache.SetSupervisedUserIdOfProfileAtIndex(index, supervised_user_id);
+
+  // Cache a "high res" icon so we don't try to fetch one over the network.
+  ProfileAvatarDownloader avatar_downloader(

[noms (inactive), 2015/03/09 19:26:17]

nit: same question as before. Doesn't this run on non-desktop platforms too?

[Mike Lerman, 2015/03/10 15:58:59]

Same answer as before. The ProfileAvatarDownloader will self-regulate to not do
anything on non-desktop platforms.

+      cache.GetAvatarIconIndexOfProfileAtIndex(index), profile_path, &cache);
+
+  // 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);
+
   // SetNameOfProfileAtIndex may reshuffle the list of profiles, so we do it
   // last.
   cache.SetNameOfProfileAtIndex(index, user_name);
 
   testing_profiles_.insert(std::make_pair(profile_name, profile));
 
   return profile;
 }
 
 TestingProfile* TestingProfileManager::CreateTestingProfile(
@@ skipping 125 matching lines @@
       << "ProfileManager already exists";
 
   // Set up the directory for profiles.
   ASSERT_TRUE(profiles_dir_.CreateUniqueTempDir());
 
   profile_manager_ = new testing::ProfileManager(profiles_dir_.path());
   browser_process_->SetProfileManager(profile_manager_);  // Takes ownership.
 
   called_set_up_ = true;
 }