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

chrome/browser/ui/cocoa/autofill/card_unmask_prompt_view_bridge.mm

 // Copyright (c) 2015 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/cocoa/autofill/card_unmask_prompt_view_bridge.h"
 
 #include "base/bind.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_models.h"
@@ skipping 15 matching lines @@
 #include "components/grit/components_scaled_resources.h"
 #include "components/strings/grit/components_strings.h"
 #include "content/public/browser/web_contents.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "ui/base/cocoa/controls/hyperlink_button_cell.h"
 #include "ui/base/cocoa/window_size_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/image/image_skia_util_mac.h"
 #include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/vector_icons_public.h"
 #include "ui/native_theme/native_theme.h"
+#include "ui/vector_icons/vector_icons.h"
 
 namespace {
 
 const CGFloat kButtonGap = 6.0f;
 const CGFloat kButtonsToRetriableErrorGap = 12.0f;
 const CGFloat kCvcInputWidth = 64.0f;
 const CGFloat kCvcInputToImageGap = 8.0f;
 const CGFloat kDialogContentMinWidth = 210.0f;
 const CGFloat kInputRowToInstructionsGap = 16.0f;
 const CGFloat kInstructionsToTitleGap = 8.0f;
@@ skipping 447 matching lines @@
       setState:(controller->GetStoreLocallyStartState() ? NSOnState
                                                         : NSOffState)];
   [storageCheckbox_ sizeToFit];
   [box addSubview:storageCheckbox_];
 
   // Add "i" icon with tooltip.
   storageTooltip_.reset([[AutofillTooltipController alloc]
       initWithArrowLocation:info_bubble::kTopTrailing]);
   [storageTooltip_ setMaxTooltipWidth:2 * autofill::kFieldWidth +
                                       autofill::kHorizontalFieldPadding];
-  [storageTooltip_
-      setImage:gfx::NSImageFromImageSkia(gfx::CreateVectorIcon(
-                   gfx::VectorIconId::INFO_OUTLINE, autofill::kInfoIconSize,
-                   gfx::kChromeIconGrey))];
+  [storageTooltip_ setImage:gfx::NSImageFromImageSkia(gfx::CreateVectorIcon(
+                                ui::kInfoOutlineIcon, autofill::kInfoIconSize,
+                                gfx::kChromeIconGrey))];
   [storageTooltip_
       setMessage:base::SysUTF16ToNSString(l10n_util::GetStringUTF16(
                      IDS_AUTOFILL_CARD_UNMASK_PROMPT_STORAGE_TOOLTIP))];
   [box addSubview:[storageTooltip_ view]];
   [[storageTooltip_ view] setFrameOrigin:
       NSMakePoint(NSMaxX([storageCheckbox_ frame]) + kButtonGap, 0)];
 
   // Add horizontal separator.
   base::scoped_nsobject<NSBox> separator(
       [CardUnmaskPromptViewCocoa createPlainBox]);
@@ skipping 218 matching lines @@
   [verifyButton_ setAction:@selector(onVerify:)];
   [verifyButton_ sizeToFit];
   [self updateVerifyButtonEnabled];
   [mainView addSubview:verifyButton_];
 
   [self setView:mainView];
   [self performLayoutAndDisplay:NO];
 }
 
 @end