Move more vector icons to more appropriate directories.

media/remoting/interstitial.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 "media/remoting/interstitial.h"
 
 #include <algorithm>  // for std::max()
 
 #include "media/base/localized_strings.h"
 #include "media/base/video_frame.h"
 #include "media/base/video_util.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "third_party/skia/include/effects/SkBlurImageFilter.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/skbitmap_operations.h"
-#include "ui/gfx/vector_icons_public.h"
+#include "ui/vector_icons/vector_icons.h"
 
 namespace media {
 namespace remoting {
 
 namespace {
 
 // The interstitial frame size when |background_image| is empty or has low
 // resolution. The frame height may be adjusted according to the aspect ratio of
 // the |background_image|.
 constexpr int kDefaultFrameWidth = 1280;
@@ skipping 54 matching lines @@
   SkScalar display_text_width =
       paint.measureText(message.data(), message.size());
   SkScalar sk_text_offset_x =
       SkScalarFloorToScalar((canvas_size.width() - display_text_width) / 2.0);
   SkScalar sk_text_offset_y =
       SkScalarFloorToScalar((canvas_size.height() / 2.0) + text_height);
   canvas->drawText(message.data(), message.size(), sk_text_offset_x,
                    sk_text_offset_y, paint);
 
   // Draw the appropriate Cast icon.
-  gfx::VectorIconId current_icon =
-      (type == InterstitialType::IN_SESSION
-           ? gfx::VectorIconId::MEDIA_ROUTER_ACTIVE
-           : gfx::VectorIconId::MEDIA_ROUTER_WARNING);
+  const gfx::VectorIcon& current_icon = type == InterstitialType::IN_SESSION
+                                            ? ui::kMediaRouterActiveIcon
+                                            : ui::kMediaRouterWarningIcon;
   gfx::ImageSkia icon_image = gfx::CreateVectorIcon(
       current_icon, canvas_size.height() / 6, SK_ColorLTGRAY);
   const SkBitmap* icon_bitmap = icon_image.bitmap();
   SkScalar sk_image_offset_x = (canvas_size.width() - icon_image.width()) / 2.0;
   SkScalar sk_image_offset_y =
       (canvas_size.height() / 2.0) - icon_image.height();
   canvas->drawBitmap(*icon_bitmap, sk_image_offset_x, sk_image_offset_y,
                      &paint);
 }
 
@@ skipping 47 matching lines @@
     CopyRGBToVideoFrame(reinterpret_cast<uint8_t*>(canvas_bitmap.getPixels()),
                         canvas_bitmap.rowBytes(),
                         gfx::Rect(canvas_size.width(), canvas_size.height()),
                         video_frame.get());
   }
   return video_frame;
 }
 
 }  // namespace remoting
 }  // namespace media