Simplify some old avatar menu button code.

chrome/browser/ui/views/frame/browser_view_unittest.cc

 // Copyright 2013 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/browser/ui/views/frame/browser_view.h"
 
 #include "base/macros.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/layout_constants.h"
@@ skipping 29 matching lines @@
 TEST_F(BrowserViewTest, BrowserView) {
   // The window is owned by the native widget, not the test class.
   EXPECT_FALSE(window());
 
   EXPECT_TRUE(browser_view()->browser());
 
   // Test initial state.
   EXPECT_TRUE(browser_view()->IsTabStripVisible());
   EXPECT_FALSE(browser_view()->IsOffTheRecord());
   EXPECT_FALSE(browser_view()->IsGuestSession());
-  EXPECT_FALSE(browser_view()->ShouldShowAvatar());
   EXPECT_TRUE(browser_view()->IsBrowserTypeNormal());
   EXPECT_FALSE(browser_view()->IsFullscreen());
   EXPECT_FALSE(browser_view()->IsBookmarkBarVisible());
   EXPECT_FALSE(browser_view()->IsBookmarkBarAnimating());
 }
 
 // Test layout of the top-of-window UI.
 TEST_F(BrowserViewTest, BrowserViewLayout) {
   BookmarkBarView::DisableAnimationsForTesting(true);
 
@@ skipping 138 matching lines @@
       header_offset.y();
 
   // The web contents should be flush with the bottom of the header.
   EXPECT_EQ(bottom_of_header, contents_container->y());
 
   // The find bar should overlap the 1px header/web-contents separator at the
   // bottom of the header.
   EXPECT_LT(browser_view()->GetFindBarBoundingBox().y(),
             browser_view()->frame()->GetTopInset(false));
 }