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

chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.cc

 // 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.
 
 #include "chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.h"
 
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_bubble_delegate.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/harmony/layout_delegate.h"
 #include "chrome/grit/locale_settings.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/vector_icons_public.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/layout/box_layout.h"
 
 namespace {
 const int kIconSize = 16;
 }
 
@@ skipping 15 matching lines @@
   GetWidget()->Show();
 }
 
 views::View* ToolbarActionsBarBubbleViews::CreateExtraView() {
   std::unique_ptr<ToolbarActionsBarBubbleDelegate::ExtraViewInfo>
       extra_view_info = delegate_->GetExtraViewInfo();
 
   if (!extra_view_info)
     return nullptr;
 
-  gfx::VectorIconId resource_id = extra_view_info->resource_id;
   std::unique_ptr<views::ImageView> icon;
-  if (resource_id != gfx::VectorIconId::VECTOR_ICON_NONE) {
+  if (extra_view_info->resource) {
     icon.reset(new views::ImageView);
-    icon->SetImage(
-        gfx::CreateVectorIcon(resource_id, kIconSize, gfx::kChromeIconGrey));
+    icon->SetImage(gfx::CreateVectorIcon(*extra_view_info->resource, kIconSize,
+                                         gfx::kChromeIconGrey));
   }
 
   std::unique_ptr<views::Label> label;
   const base::string16& text = extra_view_info->text;
   if (!text.empty()) {
     if (extra_view_info->is_text_linked) {
       link_ = new views::Link(text);
       link_->set_listener(this);
       label.reset(link_);
     } else {
@@ skipping 93 matching lines @@
                                         : delegate_->GetDismissButtonText();
 }
 
 void ToolbarActionsBarBubbleViews::LinkClicked(views::Link* link,
                                                int event_flags) {
   delegate_->OnBubbleClosed(ToolbarActionsBarBubbleDelegate::CLOSE_LEARN_MORE);
   // Reset delegate so we don't send extra OnBubbleClosed()s.
   delegate_.reset();
   GetWidget()->Close();
 }