Remove references to IsNewAvatarMenu since the flag was removed.

chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.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/opaque_browser_frame_view_layout.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
@@ skipping 373 matching lines @@
     } else {
       // We set the icon bounds to a small rectangle in the top leading corner
       // if there are no icons on the leading side.
       window_icon_bounds_ = gfx::Rect(
           frame_thickness + kIconLeftSpacing, frame_thickness, size, size);
     }
   }
 }
 
 void OpaqueBrowserFrameViewLayout::LayoutNewStyleAvatar(views::View* host) {
-  DCHECK(switches::IsNewAvatarMenu());
   if (!new_avatar_button_)
     return;
 
   int button_width = new_avatar_button_->GetPreferredSize().width();
   int button_width_with_offset = button_width + kNewAvatarButtonOffset;
 
   int button_x =
       host->width() - trailing_button_start_ - button_width_with_offset;
   int button_y = CaptionButtonY(!IsTitleBarCondensed());
 
@@ skipping 277 matching lines @@
   has_trailing_buttons_ = false;
 
   LayoutWindowControls(host);
   LayoutTitleBar(host);
 
   // We now add a single pixel to the leading spacing. We do this because the
   // avatar and tab strip start one pixel inward compared to where things start
   // on the trailing side.
   leading_button_start_++;
 
-  if (delegate_->IsRegularOrGuestSession() && switches::IsNewAvatarMenu())
+  if (delegate_->IsRegularOrGuestSession())
     LayoutNewStyleAvatar(host);
   else
     LayoutAvatar(host);
 
   client_view_bounds_ = CalculateClientAreaBounds(
       host->width(), host->height());
 }
 
 gfx::Size OpaqueBrowserFrameViewLayout::GetPreferredSize(
     const views::View* host) const {
   // This is never used; NonClientView::GetPreferredSize() will be called
   // instead.
   NOTREACHED();
   return gfx::Size();
 }
 
 void OpaqueBrowserFrameViewLayout::ViewAdded(views::View* host,
                                              views::View* view) {
   SetView(view->id(), view);
 }
 
 void OpaqueBrowserFrameViewLayout::ViewRemoved(views::View* host,
                                                views::View* view) {
   SetView(view->id(), nullptr);
 }