Use the win10 native avatar button only for AvatarButtonStyle::NATIVE

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

 // Copyright 2014 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/profiles/avatar_button.h"
 
 #include <utility>
 
 #include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 74 matching lines @@
   // The largest text height that fits in the button. If the font list height
   // is larger than this, it will be shrunk to match it.
   // TODO(noms): Calculate this constant algorithmically from the button's size.
   const int kDisplayFontHeight = 16;
   label()->SetFontList(
       label()->font_list().DeriveWithHeightUpperBound(kDisplayFontHeight));
 
 #if defined(OS_WIN)
   // TODO(estade): Use MD button in other cases, too [http://crbug.com/591586]
   if ((base::win::GetVersion() >= base::win::VERSION_WIN10) &&
-      ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {
-    DCHECK_EQ(AvatarButtonStyle::NATIVE, button_style);
+      ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme() &&
+      button_style == AvatarButtonStyle::NATIVE)
     use_win10_native_button_ = true;
-  }
 #endif  // defined(OS_WIN)
 
   if (use_win10_native_button_) {
     constexpr int kMdButtonIconHeight = 16;
     constexpr SkColor kMdButtonIconColor =
         SkColorSetA(SK_ColorBLACK, static_cast<SkAlpha>(0.54 * 0xFF));
     generic_avatar_ = gfx::CreateVectorIcon(
         kAccountCircleIcon, kMdButtonIconHeight, kMdButtonIconColor);
     SetBorder(CreateWin10NativeBorder());
 
@@ skipping 164 matching lines @@
   const int kDefaultImageTextSpacing = 5;
   SetImageLabelSpacing(use_generic_button ? 0 : kDefaultImageTextSpacing);
 
   PreferredSizeChanged();
 }
 
 void AvatarButton::SetButtonAvatar(int avatar_idr) {
   ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
   generic_avatar_ = *rb->GetImageNamed(avatar_idr).ToImageSkia();
 }