Revert of Refactor the avatar button/icon class

chrome/browser/ui/views/profiles/avatar_menu_button.cc

Index: chrome/browser/ui/views/profiles/avatar_menu_button.cc
diff --git a/chrome/browser/ui/views/profiles/avatar_menu_button.cc b/chrome/browser/ui/views/profiles/avatar_menu_button.cc
index 9d26f7076e7fafce1b5ce9330f78af96d7481208..3100a621347f5472fc4cd93069aa26796d068af4 100644
--- a/chrome/browser/ui/views/profiles/avatar_menu_button.cc
+++ b/chrome/browser/ui/views/profiles/avatar_menu_button.cc
@@ -35,8 +35,8 @@
 const char AvatarMenuButton::kViewClassName[] = "AvatarMenuButton";
 
 AvatarMenuButton::AvatarMenuButton(Browser* browser, bool disabled)
-    : AvatarBaseButton(browser),
-      MenuButton(NULL, base::string16(), this, false),
+    : MenuButton(NULL, base::string16(), this, false),
+      browser_(browser),
       disabled_(disabled),
       is_rectangle_(false),
       old_height_(0),
@@ -46,8 +46,6 @@
 
   SetEventTargeter(
       scoped_ptr<views::ViewTargeter>(new views::ViewTargeter(this)));
-
-  Update();
 }
 
 AvatarMenuButton::~AvatarMenuButton() {
@@ -146,24 +144,6 @@
   return true;
 }
 
-void AvatarMenuButton::Update() {
-  // The browser can be null in tests.
-  if (!browser())
-    return;
-
-  const bool should_show_avatar_menu = AvatarMenu::ShouldShowAvatarMenu();
-  SetEnabled(should_show_avatar_menu);
-
-  gfx::Image avatar;
-  gfx::Image taskbar_badge_avatar;
-  bool is_rectangle = false;
-  if (AvatarMenuButton::GetAvatarImages(
-          browser()->profile(), should_show_avatar_menu, &avatar,
-          &taskbar_badge_avatar, &is_rectangle)) {
-    SetAvatarIcon(avatar, is_rectangle);
-  }
-}
-
 // views::ViewTargeterDelegate:
 bool AvatarMenuButton::DoesIntersectRect(const views::View* target,
                                          const gfx::Rect& rect) const {
@@ -176,5 +156,5 @@
 void AvatarMenuButton::OnMenuButtonClicked(views::View* source,
                                            const gfx::Point& point) {
   if (!disabled_)
-    chrome::ShowAvatarMenu(browser());
+    chrome::ShowAvatarMenu(browser_);
 }