Reland crrev.com/8283cad74e0cad4840d1f with fix for static initializers.

chrome/browser/ui/views/payments/payment_request_views_util.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 "chrome/browser/ui/views/payments/payment_request_views_util.h"
 
 #include "base/memory/ptr_util.h"
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/ui/views/payments/payment_request_sheet_controller.h"
 #include "third_party/skia/include/core/SkColor.h"
-#include "ui/gfx/vector_icons_public.h"
 #include "ui/views/background.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/vector_icon_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/view.h"
 
 namespace payments {
 
@@ skipping 14 matching lines @@
                      1, views::GridLayout::USE_PREF, 0, 0);
   // A column for the close button.
   columns->AddColumn(views::GridLayout::TRAILING, views::GridLayout::CENTER,
                      0, views::GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, 0);
   if (!show_back_arrow) {
     layout->SkipColumns(1);
   } else {
     views::VectorIconButton* back_arrow = new views::VectorIconButton(delegate);
-    back_arrow->SetIcon(gfx::VectorIconId::NAVIGATE_BACK);
+    back_arrow->SetIcon(kNavigateBackIcon);
     back_arrow->SetSize(back_arrow->GetPreferredSize());
     back_arrow->set_tag(static_cast<int>(
         PaymentRequestCommonTags::BACK_BUTTON_TAG));
     layout->AddView(back_arrow);
   }
 
   views::Label* title_label = new views::Label(title);
   title_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   layout->AddView(title_label);
   views::Button* close_button =
@@ skipping 33 matching lines @@
   layout->AddView(header_view.release());
 
   layout->StartRow(0, 0);
   // |content_view| will be deleted when |view| is.
   layout->AddView(content_view.release());
 
   return view;
 }
 
 }  // namespace payments