| Index: chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration_unittest.mm
|
| diff --git a/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration_unittest.mm b/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration_unittest.mm
|
| index a8a1ae8480ff0ac949ca49cc823b9bd4a17060b9..5f46266f6ec525b5bace53f758ada045a41c2a0c 100644
|
| --- a/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration_unittest.mm
|
| +++ b/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration_unittest.mm
|
| @@ -30,13 +30,9 @@
|
| // With Material Design vector images the image isn't set at creation time
|
| // but later by the LocationBar. The unit tests fail with a nil image, so
|
| // initialize it now.
|
| - if (ui::MaterialDesignController::IsModeMaterial()) {
|
| - const int kDefaultIconSize = 16;
|
| - decoration_.SetImage(NSImageFromImageSkia(
|
| - gfx::CreateVectorIcon(gfx::VectorIconId::OMNIBOX_SEARCH,
|
| - kDefaultIconSize,
|
| - SK_ColorBLACK)));
|
| - }
|
| + const int kDefaultIconSize = 16;
|
| + decoration_.SetImage(NSImageFromImageSkia(gfx::CreateVectorIcon(
|
| + gfx::VectorIconId::OMNIBOX_SEARCH, kDefaultIconSize, SK_ColorBLACK)));
|
| }
|
|
|
| SelectedKeywordDecoration decoration_;
|
| @@ -47,13 +43,8 @@
|
| TEST_F(SelectedKeywordDecorationTest, UsesPartialKeywordIfNarrow) {
|
|
|
| const base::string16 kKeyword = base::ASCIIToUTF16("Engine");
|
| - NSString* const kFullString = ui::MaterialDesignController::IsModeMaterial()
|
| - ? @"Search Engine"
|
| - : @"Search Engine:";
|
| - NSString* const kPartialString =
|
| - ui::MaterialDesignController::IsModeMaterial()
|
| - ? @"Search En\u2026"
|
| - : @"Search En\u2026:"; // ellipses
|
| + NSString* const kFullString = @"Search Engine";
|
| + NSString* const kPartialString = @"Search En\u2026";
|
|
|
| decoration_.SetKeyword(kKeyword, false);
|
|
|
|
|