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

chrome/browser/ui/cocoa/browser_window_touch_bar.mm

 // Copyright 2017 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/browser_window_touch_bar.h"
 
 #include "base/mac/mac_util.h"
 #import "base/mac/scoped_nsobject.h"
 #import "base/mac/sdk_forward_declarations.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_command_controller.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/omnibox/browser/vector_icons.h"
 #include "components/search_engines/util.h"
 #include "components/toolbar/vector_icons.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/image/image.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/vector_icons/vector_icons.h"
 
 namespace {
 
 // The touch bar's identifier.
 const NSTouchBarCustomizationIdentifier kBrowserWindowTouchBarId =
     @"BrowserWindowTouchBarId";
 
 // Touch bar items identifiers.
 const NSTouchBarItemIdentifier kBackForwardTouchId = @"BackForwardTouchId";
@@ skipping 147 matching lines @@
       SEARCH_ENGINE_GOOGLE;
 
   base::string16 title =
       isGoogle ? l10n_util::GetStringUTF16(IDS_TOUCH_BAR_GOOGLE_SEARCH)
                : l10n_util::GetStringFUTF16(IDS_TOUCH_BAR_SEARCH,
                                             defaultProvider->short_name());
 
   NSImage* image;
   if (isGoogle) {
     image = NSImageFromImageSkiaWithColorSpace(
-        gfx::CreateVectorIcon(gfx::VectorIconId::GOOGLE_SEARCH_MAC_TOUCHBAR,
-                              kTouchBarIconSize, gfx::kPlaceholderColor),
+        gfx::CreateVectorIcon(kGoogleSearchMacTouchbarIcon, kTouchBarIconSize,
+                              gfx::kPlaceholderColor),
         base::mac::GetSRGBColorSpace());
   } else {
-    image = CreateNSImageFromIcon(omnibox::kSearchIcon);
+    image = CreateNSImageFromIcon(ui::kSearchIcon);
   }
 
   NSButton* searchButton =
       [NSButton buttonWithTitle:base::SysUTF16ToNSString(title)
                           image:image
                          target:self
                          action:@selector(executeCommand:)];
   searchButton.imageHugsTitle = YES;
   searchButton.tag = IDC_FOCUS_LOCATION;
   [searchButton.widthAnchor
       constraintEqualToConstant:kTouchBarSearchButtonWidth]
       .active = YES;
   return searchButton;
 }
 
 - (void)backOrForward:(id)sender {
   NSSegmentedControl* control = sender;
   if ([control selectedSegment] == kBackSegmentIndex)
     commandUpdater_->ExecuteCommand(IDC_BACK);
   else
     commandUpdater_->ExecuteCommand(IDC_FORWARD);
 }
 
 - (void)executeCommand:(id)sender {
   commandUpdater_->ExecuteCommand([sender tag]);
 }
 
-@end
+@end