Move around more vector icons.

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

 // 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.
 
 #import "chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include <memory>
 #include <vector>
 
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/chooser_controller/mock_chooser_controller.h"
 #import "chrome/browser/ui/cocoa/device_chooser_content_view_cocoa.h"
 #import "chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa.h"
 #include "chrome/browser/ui/cocoa/spinner_view.h"
 #import "chrome/browser/ui/cocoa/test/cocoa_profile_test.h"
 #include "chrome/browser/ui/cocoa/test/cocoa_test_helper.h"
 #include "chrome/grit/generated_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gtest_mac.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_unittest_util.h"
 #include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/vector_icons_public.h"
 #include "ui/resources/grit/ui_resources.h"
 
 namespace {
 
 // The lookup table for signal strength level image.
 const int kSignalStrengthLevelImageIds[5] = {IDR_SIGNAL_0_BAR, IDR_SIGNAL_1_BAR,
                                              IDR_SIGNAL_2_BAR, IDR_SIGNAL_3_BAR,
                                              IDR_SIGNAL_4_BAR};
 const int kSignalStrengthLevelImageSelectedIds[5] = {
     IDR_SIGNAL_0_BAR_SELECTED, IDR_SIGNAL_1_BAR_SELECTED,
@@ skipping 70 matching lines @@
             : kSignalStrengthLevelImageSelectedIds
                   [expected_signal_strength_level];
     EXPECT_NSEQ(rb_.GetNativeImageNamed(image_id).ToNSImage(),
                 [image_view image]);
   }
 
   void ExpectRowImageIsConnectedImage(int row, SkColor expected_color) {
     NSImageView* image_view = [device_chooser_content_view_
         tableRowViewImage:static_cast<NSInteger>(row)];
     ASSERT_TRUE(image_view);
-    EXPECT_TRUE(gfx::test::AreImagesEqual(
-        gfx::Image(gfx::CreateVectorIcon(gfx::VectorIconId::BLUETOOTH_CONNECTED,
-                                         expected_color)),
-        gfx::Image([[image_view image] copy])));
+    EXPECT_TRUE(
+        gfx::test::AreImagesEqual(gfx::Image(gfx::CreateVectorIcon(
+                                      kBluetoothConnectedIcon, expected_color)),
+                                  gfx::Image([[image_view image] copy])));
   }
 
   void ExpectRowTextIs(int row, NSString* expected_text) {
     EXPECT_NSEQ(expected_text,
                 [[device_chooser_content_view_
                     tableRowViewText:static_cast<NSInteger>(row)] stringValue]);
   }
 
   void ExpectRowTextColorIs(int row, NSColor* expected_color) {
     EXPECT_NSEQ(expected_color,
@@ skipping 1087 matching lines @@
       MockChooserController::ConnectedPairedStatus::NONE);
 
   // Select option 0 and press "Get help" button.
   [table_view_ selectRowIndexes:[NSIndexSet indexSetWithIndex:0]
            byExtendingSelection:NO];
   EXPECT_CALL(*mock_chooser_controller_, Select(testing::_)).Times(0);
   EXPECT_CALL(*mock_chooser_controller_, Cancel()).Times(0);
   EXPECT_CALL(*mock_chooser_controller_, OpenHelpCenterUrl()).Times(1);
   [help_button_ performClick:chooser_dialog_controller_];
 }