Reland f5157480667e99269e0062e9df1df3875db with fix for compile failure.

ash/common/frame/caption_buttons/frame_caption_button_container_view_unittest.cc

Index: ash/common/frame/caption_buttons/frame_caption_button_container_view_unittest.cc
diff --git a/ash/common/frame/caption_buttons/frame_caption_button_container_view_unittest.cc b/ash/common/frame/caption_buttons/frame_caption_button_container_view_unittest.cc
index 067e868abd50e2570ebf7b1b941d131abc2bf4c4..21fce7ca98fd81a5fdf172f18bbacd7cf25fd27a 100644
--- a/ash/common/frame/caption_buttons/frame_caption_button_container_view_unittest.cc
+++ b/ash/common/frame/caption_buttons/frame_caption_button_container_view_unittest.cc
@@ -8,10 +8,10 @@
 #include "ash/common/frame/caption_buttons/frame_caption_button.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm_shell.h"
+#include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/test/ash_test_base.h"
 #include "grit/ash_resources.h"
 #include "ui/gfx/geometry/rect.h"
-#include "ui/gfx/vector_icons_public.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
@@ -71,7 +71,7 @@ class FrameCaptionButtonContainerViewTest : public ash::test::AshTestBase {
         GetAshLayoutSize(AshLayoutSize::NON_BROWSER_CAPTION_BUTTON));
     for (int icon = 0; icon < CAPTION_BUTTON_ICON_COUNT; ++icon) {
       container->SetButtonImage(static_cast<CaptionButtonIcon>(icon),
-                                gfx::VectorIconId::WINDOW_CONTROL_CLOSE);
+                                ash::kWindowControlCloseIcon);
     }
   }