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

chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac_unittest.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 "base/logging.h"
 #import "base/mac/foundation_util.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
-#import "chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac.h"
 #import "chrome/browser/ui/cocoa/test/cocoa_test_helper.h"
 #include "chrome/browser/ui/cocoa/test/run_loop_testing.h"
 #include "chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/grit/components_scaled_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #import "ui/events/test/cocoa_test_event_utils.h"
-#include "ui/gfx/vector_icons_public.h"
+#include "ui/vector_icons/vector_icons.h"
 
 // A simple class to observe when a window is destructing.
 @interface WindowObserver : NSObject {
   BOOL windowIsClosing_;
 }
 
 - (id)initWithWindow:(NSWindow*)window;
 
 - (void)dealloc;
 
@@ skipping 245 matching lines @@
   }
 
   // Test with an extra view of a (unlinked) text and icon and action button.
   {
     TestToolbarActionsBarBubbleDelegate delegate(HeadingString(), BodyString(),
                                                  ActionString());
 
     std::unique_ptr<ToolbarActionsBarBubbleDelegate::ExtraViewInfo>
         extra_view_info =
             base::MakeUnique<ToolbarActionsBarBubbleDelegate::ExtraViewInfo>();
-    extra_view_info->resource_id = gfx::VectorIconId::BUSINESS;
+    extra_view_info->resource = &ui::kBusinessIcon;
     extra_view_info->text =
         l10n_util::GetStringUTF16(IDS_EXTENSIONS_INSTALLED_BY_ADMIN);
     extra_view_info->is_text_linked = false;
     delegate.set_extra_view_info(std::move(extra_view_info));
 
     ToolbarActionsBarBubbleMac* bubble = CreateAndShowBubble(&delegate);
     EXPECT_TRUE([bubble actionButton]);
     EXPECT_TRUE([bubble iconView]);
     EXPECT_TRUE([bubble label]);
     EXPECT_FALSE([bubble link]);
@@ skipping 23 matching lines @@
     EXPECT_FALSE([bubble iconView]);
     EXPECT_FALSE([bubble label]);
     EXPECT_TRUE([bubble link]);
     EXPECT_TRUE([bubble dismissButton]);
     EXPECT_TRUE([bubble itemList]);
 
     [bubble close];
     chrome::testing::NSRunLoopRunAllPending();
   }
 }