Revert of Refactor the avatar button/icon class

chrome/chrome_browser_ui.gypi

 # Copyright 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.
 
 {
   'variables': {
     # There are two sections of sources:
     # * "Platform"-based sources (OS, toolkit, etc.)
     # * Feature/directory-based sources (e.g., history, printing)
 
@@ skipping 2291 matching lines @@
       'browser/ui/views/passwords/manage_credential_item_view.h',
       'browser/ui/views/passwords/manage_password_items_view.cc',
       'browser/ui/views/passwords/manage_password_items_view.h',
       'browser/ui/views/passwords/manage_passwords_bubble_view.cc',
       'browser/ui/views/passwords/manage_passwords_bubble_view.h',
       'browser/ui/views/passwords/manage_passwords_icon_view.cc',
       'browser/ui/views/passwords/manage_passwords_icon_view.h',
       'browser/ui/views/passwords/save_account_more_combobox_model.cc',
       'browser/ui/views/passwords/save_account_more_combobox_model.h',
       'browser/ui/views/process_singleton_dialog_linux.cc',
-      'browser/ui/views/profiles/avatar_base_button.cc',
-      'browser/ui/views/profiles/avatar_base_button.h',
       'browser/ui/views/profiles/avatar_menu_bubble_view.cc',
       'browser/ui/views/profiles/avatar_menu_bubble_view.h',
       'browser/ui/views/profiles/avatar_menu_button.cc',
       'browser/ui/views/profiles/avatar_menu_button.h',
       'browser/ui/views/profiles/new_avatar_button.cc',
       'browser/ui/views/profiles/new_avatar_button.h',
       'browser/ui/views/profiles/profile_chooser_view.cc',
       'browser/ui/views/profiles/profile_chooser_view.h',
       'browser/ui/views/profiles/profile_reset_bubble_view.cc',
       'browser/ui/views/profiles/profile_reset_bubble_view.h',
@@ skipping 867 matching lines @@
           ],
           'sources': [
             '<@(chrome_browser_ui_non_mobile_sources)',
             '<@(chrome_browser_ui_omnibox_non_mobile_sources)',
           ],
         }],
       ],
     },
   ],
 }