Reland of: Change default code flag to NewAvatarMenu.

chrome/browser/profiles/profile_info_cache.h

Index: chrome/browser/profiles/profile_info_cache.h
diff --git a/chrome/browser/profiles/profile_info_cache.h b/chrome/browser/profiles/profile_info_cache.h
index 7b005fc5c5dceedf928ab44af728ef99d2d1a1de..7b935f826ddd24bf630c45d43b1bedade7bcf852 100644
--- a/chrome/browser/profiles/profile_info_cache.h
+++ b/chrome/browser/profiles/profile_info_cache.h
@@ -62,7 +62,7 @@ class ProfileInfoCache : public ProfileInfoInterface,
   base::FilePath GetPathOfProfileAtIndex(size_t index) const override;
   base::Time GetProfileActiveTimeAtIndex(size_t index) const override;
   base::string16 GetUserNameOfProfileAtIndex(size_t index) const override;
-  const gfx::Image& GetAvatarIconOfProfileAtIndex(size_t index) const override;
+  const gfx::Image& GetAvatarIconOfProfileAtIndex(size_t index) override;
   std::string GetLocalAuthCredentialsOfProfileAtIndex(
       size_t index) const override;
   // Note that a return value of false could mean an error in collection or
@@ -148,6 +148,11 @@ class ProfileInfoCache : public ProfileInfoInterface,
   void AddObserver(ProfileInfoCacheObserver* obs);
   void RemoveObserver(ProfileInfoCacheObserver* obs);
 
+  void set_disable_avatar_download_for_testing(
+      bool disable_avatar_download_for_testing) {
+    disable_avatar_download_for_testing_ = disable_avatar_download_for_testing;
+  }
+
  private:
   FRIEND_TEST_ALL_PREFIXES(ProfileInfoCacheTest, DownloadHighResAvatarTest);
 
@@ -224,6 +229,10 @@ class ProfileInfoCache : public ProfileInfoInterface,
   std::map<std::string, ProfileAvatarDownloader*>
       avatar_images_downloads_in_progress_;
 
+  // Determines of the ProfileAvatarDownloader should be created and executed
+  // or not. Only set to true for tests.
+  bool disable_avatar_download_for_testing_;
+
   DISALLOW_COPY_AND_ASSIGN(ProfileInfoCache);
 };