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

chrome/browser/ui/views/location_bar/selected_keyword_view.cc

 // Copyright (c) 2012 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/views/location_bar/selected_keyword_view.h"
 
 #include "base/logging.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/location_bar/location_bar_util.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/grit/generated_resources.h"
-#include "components/omnibox/browser/vector_icons.h"
 #include "components/search_engines/template_url_service.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.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"
 
 SelectedKeywordView::SelectedKeywordView(const gfx::FontList& font_list,
                                          Profile* profile)
     : IconLabelBubbleView(font_list, false), profile_(profile) {
   full_label_.SetFontList(font_list);
   full_label_.SetVisible(false);
   partial_label_.SetFontList(font_list);
   partial_label_.SetVisible(false);
 }
 
 SelectedKeywordView::~SelectedKeywordView() {
 }
 
 void SelectedKeywordView::ResetImage() {
-  SetImage(gfx::CreateVectorIcon(omnibox::kSearchIcon,
-                                 LocationBarView::kIconWidth, GetTextColor()));
+  SetImage(gfx::CreateVectorIcon(ui::kSearchIcon, LocationBarView::kIconWidth,
+                                 GetTextColor()));
 }
 
 SkColor SelectedKeywordView::GetTextColor() const {
   return GetNativeTheme()->GetSystemColor(
       color_utils::IsDark(GetParentBackgroundColor())
           ? ui::NativeTheme::kColorId_TextfieldDefaultColor
           : ui::NativeTheme::kColorId_LinkEnabled);
 }
 
 gfx::Size SelectedKeywordView::GetPreferredSize() const {
@@ skipping 42 matching lines @@
 
   // Update the label now so ShouldShowLabel() works correctly when the parent
   // class is calculating the preferred size. It will be updated again in
   // Layout(), taking into account how much space has actually been allotted.
   SetLabel(full_name);
 }
 
 const char* SelectedKeywordView::GetClassName() const {
   return "SelectedKeywordView";
 }