[Material][Mac] Update the User Account Button

chrome/browser/ui/cocoa/profiles/avatar_button_controller_unittest.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/profiles/avatar_button_controller.h"
 
 #include "base/command_line.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/base_bubble_controller.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "chrome/browser/ui/cocoa/info_bubble_window.h"
 #import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #import "testing/gtest_mac.h"
+#include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 
 // Defined in the AvatarButtonController implementation.
 @interface AvatarButtonController (ExposedForTesting)
 - (void)setErrorStatus:(BOOL)hasError;
 @end
 
 // Subclassing AvatarButtonController to be able to control the state of
 // keyboard modifierFlags.
 @interface AvatarButtonControllerForTesting : AvatarButtonController {
@@ skipping 65 matching lines @@
 TEST_F(AvatarButtonControllerTest, ProfileButtonWithErrorShown) {
   // Create a second profile, to force the button to display the profile name.
   testing_profile_manager()->CreateTestingProfile("batman");
 
   EXPECT_EQ(0, [button() image].size.width);
   [controller() setErrorStatus:true];
 
   ASSERT_FALSE([view() isHidden]);
   EXPECT_NSEQ(@"Person 1", [button() title]);
 
-  // If the button has an authentication error, it should display an error icon.
-  int errorWidth = ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
-      IDR_ICON_PROFILES_AVATAR_BUTTON_ERROR).Width();
+  // If the button has an authentication error, it should display an error
+  // icon. If in the MD, the icon size should be 16.
+  int errorWidth =
+      ui::MaterialDesignController::IsModeMaterial()
+          ? 16
+          : ui::ResourceBundle::GetSharedInstance()
+                .GetNativeImageNamed(IDR_ICON_PROFILES_AVATAR_BUTTON_ERROR)
+                .Width();
+
   EXPECT_EQ(errorWidth, [button() image].size.width);
 }
 
 TEST_F(AvatarButtonControllerTest, DoubleOpen) {
   EXPECT_FALSE([controller() menuController]);
 
   [button() performClick:button()];
 
   BaseBubbleController* menu = [controller() menuController];
   EXPECT_TRUE(menu);
@@ skipping 30 matching lines @@
   BaseBubbleController* menu = [controller() menuController];
   EXPECT_TRUE(menu);
   EXPECT_TRUE([menu isKindOfClass:[ProfileChooserController class]]);
 
   // Do not animate out because that is hard to test around.
   static_cast<InfoBubbleWindow*>(menu.window).allowedAnimations =
       info_bubble::kAnimateNone;
   [menu close];
   EXPECT_FALSE([controller() menuController]);
 }