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

ui/gfx/vector_icon_types.h

 // Copyright 2015 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.
 
 // This file provides defines needed by PaintVectorIcon and is implemented
 // by the generated file vector_icons.cc.
 
 #ifndef UI_GFX_VECTOR_ICON_TYPES_H_
 #define UI_GFX_VECTOR_ICON_TYPES_H_
 
@@ skipping 46 matching lines @@
   DISABLE_AA,
   // Flips the x-axis in RTL locales. Default is false, this command sets it to
   // true.
   FLIPS_IN_RTL,
   // Marks the end of the list of commands.
   END
 };
 
 // A POD that describes either a path command or an argument for it.
 struct PathElement {
-  PathElement(CommandType value) : type(value) {}
-  PathElement(SkScalar value) : arg(value) {}
+  constexpr PathElement(CommandType value) : type(value) {}
+  constexpr PathElement(SkScalar value) : arg(value) {}
 
   union {
     CommandType type;
     SkScalar arg;
   };
 };
 
 struct VectorIcon {
-  VectorIcon() : path_(nullptr), path_1x_(nullptr) {}
-  VectorIcon(gfx::PathElement* path, gfx::PathElement* path_1x)
-      : path_(path), path_1x_(path_1x) {}
-
   bool is_empty() const { return !path_; }
 
-  gfx::PathElement* path_;
-  gfx::PathElement* path_1x_;
+  const gfx::PathElement* path_;
+  const gfx::PathElement* path_1x_;
 };
 
 // Returns an array of path commands and arguments, terminated by END.
 const PathElement* GetPathForVectorIcon(VectorIconId id);
 // As above, but returns an icon specifically adjusted for 1x scale factors.
 // This draws from icon files that end with .1x.icon. If no such file exists,
 // it will fall back to GetPathForVectorIcon.
 const PathElement* GetPathForVectorIconAt1xScale(VectorIconId id);
 
 }  // namespace gfx
 
 #endif  // UI_GFX_VECTOR_ICON_TYPES_H_