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

chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac.mm

 // Copyright 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.
 
 #import "chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac.h"
 
 #include <utility>
 
 #include "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 179 matching lines @@
                          alignment:NSLeftTextAlignment];
   NSSize headingSize = [heading frame].size;
 
   NSSize extraViewIconSize = NSZeroSize;
   NSSize extraViewTextSize = NSZeroSize;
 
   std::unique_ptr<ToolbarActionsBarBubbleDelegate::ExtraViewInfo>
       extra_view_info = delegate_->GetExtraViewInfo();
 
   if (extra_view_info) {
-    gfx::VectorIconId resource_id = extra_view_info->resource_id;
     // The extra view icon is optional.
-    if (resource_id != gfx::VectorIconId::VECTOR_ICON_NONE) {
-      NSImage* image = gfx::Image(gfx::CreateVectorIcon(resource_id, 16,
-                                                        gfx::kChromeIconGrey))
-                           .ToNSImage();
+    if (extra_view_info->resource) {
+      NSImage* image =
+          gfx::Image(gfx::CreateVectorIcon(*extra_view_info->resource, 16,
+                                           gfx::kChromeIconGrey))
+              .ToNSImage();
       NSRect frame = NSMakeRect(0, 0, image.size.width, image.size.height);
       iconView_ = [[[NSImageView alloc] initWithFrame:frame] autorelease];
       [iconView_ setImage:image];
       extraViewIconSize = frame.size;
 
       [[[self window] contentView] addSubview:iconView_];
     }
 
     const base::string16& text = extra_view_info->text;
     if (!text.empty()) {  // The extra view text is optional.
@@ skipping 173 matching lines @@
   } else {
     DCHECK_EQ(sender, actionButton_);
     action = ToolbarActionsBarBubbleDelegate::CLOSE_EXECUTE;
   }
   acknowledged_ = YES;
   delegate_->OnBubbleClosed(action);
   [self close];
 }
 
 @end