Chromium Code Reviews| Index: chrome/browser/ui/cocoa/location_bar/manage_passwords_decoration_unittest.mm |
| diff --git a/chrome/browser/ui/cocoa/location_bar/manage_passwords_decoration_unittest.mm b/chrome/browser/ui/cocoa/location_bar/manage_passwords_decoration_unittest.mm |
| index b2f8ea4d8ad571122e9303d16f9538f80884c55a..bb72bb85c29139eeebfd445f20f83966c3d844bd 100644 |
| --- a/chrome/browser/ui/cocoa/location_bar/manage_passwords_decoration_unittest.mm |
| +++ b/chrome/browser/ui/cocoa/location_bar/manage_passwords_decoration_unittest.mm |
| @@ -103,20 +103,16 @@ bool ImagesEqual(NSImage* left, NSImage* right) { |
| EXPECT_EQ(GetParam().visible, decoration()->IsVisible()); |
| NSImage* expected_image = nil; |
| if (GetParam().image) { |
| - if (ui::MaterialDesignController::IsModeMaterial()) { |
| - // IDR_SAVE_PASSWORD_ACTIVE and IDR_SAVE_PASSWORD_INACTIVE map to |
| - // gfx::VectorIconId::AUTOLOGIN in Material Design - fail the test if |
| - // somehow some other value is present. |
| - EXPECT_TRUE(GetParam().image == IDR_SAVE_PASSWORD_ACTIVE || |
| - GetParam().image == IDR_SAVE_PASSWORD_INACTIVE); |
| - const int kIconSize = 16; |
| - expected_image = NSImageFromImageSkia( |
| - gfx::CreateVectorIcon(gfx::VectorIconId::AUTOLOGIN, |
| - kIconSize, |
| - gfx::kChromeIconGrey)); |
| - } else { |
| - expected_image = OmniboxViewMac::ImageForResource(GetParam().image); |
| - } |
| + // IDR_SAVE_PASSWORD_ACTIVE and IDR_SAVE_PASSWORD_INACTIVE map to |
| + // gfx::VectorIconId::AUTOLOGIN in Material Design - fail the test if |
|
Avi (use Gerrit)
2016/09/28 16:01:58
What is this "-"? This feels more semicolon to me.
Elly Fong-Jones
2016/09/28 19:02:27
Done.
|
| + // somehow some other value is present. |
| + EXPECT_TRUE(GetParam().image == IDR_SAVE_PASSWORD_ACTIVE || |
| + GetParam().image == IDR_SAVE_PASSWORD_INACTIVE); |
| + const int kIconSize = 16; |
| + expected_image = NSImageFromImageSkia( |
| + gfx::CreateVectorIcon(gfx::VectorIconId::AUTOLOGIN, |
| + kIconSize, |
| + gfx::kChromeIconGrey)); |
| } |
| EXPECT_TRUE(ImagesEqual(expected_image, decoration()->GetImage())); |
| EXPECT_NSEQ(GetParam().toolTip |