GMC: Use actual icon

This CL changes the GMC icon from the placeholder play button that
we've been using to the actual "queue music" icon we want to use. This
also fixes an issue where the icon was slightly too big for the
toolbar.

Bug: 973500, 994697
Change-Id: Idb011e4f420749280b15931651fd5134a8be755a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1802820Reviewed-by: Evan Stade <estade@chromium.org>
Commit-Queue: Tommy Steimel <steimel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#696508}

chrome/browser/ui/views/global_media_controls/media_toolbar_button_view.cc

@@ -81,13 +81,7 @@ SkColor MediaToolbarButtonView::GetInkDropBaseColor() const {
 }
 
 void MediaToolbarButtonView::UpdateIcon() {
-  // TODO(https://crbug.com/973500): Use actual icon instead of this
-  // placeholder.
-  const gfx::VectorIcon& icon = ::vector_icons::kPlayArrowIcon;
-
-  // TODO(https://crbug.com/973500): When adding the actual icon, have the size
-  // of the icon in the icon definition so we don't need to specify a size here.
-  const int dip_size = 18;
+  const gfx::VectorIcon& icon = ::vector_icons::kQueueMusicIcon;
 
   const SkColor normal_color =
       GetThemeProvider()->GetColor(ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON);
@@ -95,9 +89,9 @@ void MediaToolbarButtonView::UpdateIcon() {
       ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON_INACTIVE);
 
   SetImage(views::Button::STATE_NORMAL,
-           gfx::CreateVectorIcon(icon, dip_size, normal_color));
+           gfx::CreateVectorIcon(icon, normal_color));
   SetImage(views::Button::STATE_DISABLED,
-           gfx::CreateVectorIcon(icon, dip_size, disabled_color));
+           gfx::CreateVectorIcon(icon, disabled_color));
 }
 
 void MediaToolbarButtonView::ShowPromo() {

components/vector_icons/BUILD.gn

@@ -50,6 +50,7 @@ aggregate_vector_icons("components_vector_icons") {
     "pause.icon",
     "play_arrow.icon",
     "protocol_handler.icon",
+    "queue_music.icon",
     "reload.icon",
     "replay.icon",
     "screen_share.icon",

components/vector_icons/queue_music.icon

+// Copyright 2019 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.
+
+CANVAS_DIMENSIONS, 16,
+MOVE_TO, 10, 4,
+H_LINE_TO, 2,
+R_V_LINE_TO, 1.33f,
+R_H_LINE_TO, 8,
+CLOSE,
+R_MOVE_TO, 0, 2.67f,
+H_LINE_TO, 2,
+V_LINE_TO, 8,
+R_H_LINE_TO, 8,
+CLOSE,
+R_MOVE_TO, -8, 4,
+R_H_LINE_TO, 5.33f,
+V_LINE_TO, 9.33f,
+H_LINE_TO, 2,
+CLOSE,
+MOVE_TO, 11.33f, 4,
+R_V_LINE_TO, 5.45f,
+R_ARC_TO, 1.98f, 1.98f, 0, 0, 0, -0.66f, -0.12f,
+R_CUBIC_TO, -1.11f, 0, -2, 0.9f, -2, 2,
+R_CUBIC_TO, 0, 1.11f, 0.89f, 2, 2, 2,
+R_CUBIC_TO, 1.11f, 0, 2, -0.89f, 2, -2,
+R_V_LINE_TO, -6,
+R_H_LINE_TO, 2,
+V_LINE_TO, 4,
+CLOSE,
+R_MOVE_TO, 0, 0,
+CLOSE