Reland of: Change default code flag to NewAvatarMenu.

chrome/browser/profiles/profile_info_interface.h

 // 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.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_INFO_INTERFACE_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_INFO_INTERFACE_H_
 
 #include "base/files/file_path.h"
 #include "base/strings/string16.h"
 
@@ skipping 19 matching lines @@
 
   virtual base::string16 GetNameOfProfileAtIndex(size_t index) const = 0;
 
   virtual base::string16 GetShortcutNameOfProfileAtIndex(
       size_t index) const = 0;
 
   virtual base::FilePath GetPathOfProfileAtIndex(size_t index) const = 0;
 
   virtual base::string16 GetUserNameOfProfileAtIndex(size_t index) const = 0;
 
-  virtual const gfx::Image& GetAvatarIconOfProfileAtIndex(
-      size_t index) const = 0;
+  virtual const gfx::Image& GetAvatarIconOfProfileAtIndex(size_t index) = 0;
 
   virtual std::string GetLocalAuthCredentialsOfProfileAtIndex(
       size_t index) const = 0;
 
   // Returns true if the profile at the given index is currently running any
   // background apps.
   virtual bool GetBackgroundStatusOfProfileAtIndex(
       size_t index) const = 0;
 
   virtual base::string16 GetGAIANameOfProfileAtIndex(size_t index) const = 0;
@@ skipping 34 matching lines @@
   virtual bool ProfileIsUsingDefaultNameAtIndex(size_t index) const = 0;
 
   // Returns true if the user has never manually selected a profile avatar.
   virtual bool ProfileIsUsingDefaultAvatarAtIndex(size_t index) const = 0;
 
  protected:
   virtual ~ProfileInfoInterface() {}
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_INFO_INTERFACE_H_