Move final vector icons out of ui/gfx/vector_icons/ and remove the

chrome/browser/ui/cocoa/passwords/credential_item_button.mm

 // Copyright 2016 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/passwords/credential_item_button.h"
 
 #include "base/i18n/rtl.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_tooltip_controller.h"
 #include "chrome/browser/ui/cocoa/passwords/passwords_bubble_utils.h"
 #include "chrome/browser/ui/passwords/manage_passwords_view_utils.h"
 #include "chrome/grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_util_mac.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
-#include "ui/gfx/vector_icons_public.h"
+#include "ui/vector_icons/vector_icons.h"
 
 namespace {
 constexpr CGFloat kFocusRingInset = 3;
 constexpr CGFloat kHorizontalPaddingBetweenAvatarAndLabel = 10;
 }  // namespace
 
 // Custom button cell that adds a left padding before the avatar, and a custom
 // spacing between the avatar and label.
 @interface CredentialItemButtonCell : NSButtonCell {
  @private
@@ skipping 98 matching lines @@
     [self setImagePosition:base::i18n::IsRTL() ? NSImageRight : NSImageLeft];
     [self setAlignment:NSNaturalTextAlignment];
   }
   return self;
 }
 
 - (NSView*)addInfoIcon:(NSString*)tooltip {
   DCHECK(!iconController_);
   iconController_.reset([[AutofillTooltipController alloc]
       initWithArrowLocation:info_bubble::kTopTrailing]);
-  NSImage* image = gfx::NSImageFromImageSkia(gfx::CreateVectorIcon(
-      gfx::VectorIconId::INFO_OUTLINE, gfx::kChromeIconGrey));
+  NSImage* image = gfx::NSImageFromImageSkia(
+      gfx::CreateVectorIcon(ui::kInfoOutlineIcon, gfx::kChromeIconGrey));
   [iconController_ setImage:image];
   [iconController_ setMessage:tooltip];
   [self addSubview:[iconController_ view]];
   return [iconController_ view];
 }
 
 + (NSImage*)defaultAvatar {
   return gfx::NSImageFromImageSkia(ScaleImageForAccountAvatar(
       *ResourceBundle::GetSharedInstance()
            .GetImageNamed(IDR_PROFILE_AVATAR_PLACEHOLDER_LARGE)
            .ToImageSkia()));
 }
 
 - (void)setHoverState:(HoverState)state {
   [super setHoverState:state];
   bool isHighlighted = ([self hoverState] != kHoverStateNone);
 
   NSColor* backgroundColor = isHighlighted ? hoverColor_ : backgroundColor_;
   [[self cell] setBackgroundColor:backgroundColor];
 }
 
 - (BOOL)canBecomeKeyView {
   return YES;
 }
 
 @end