Revert of cc: Move SkShader construction to a single spot in PaintShader

ui/native_theme/native_theme_base.cc

Index: ui/native_theme/native_theme_base.cc
diff --git a/ui/native_theme/native_theme_base.cc b/ui/native_theme/native_theme_base.cc
index 6711ce93a3f085943bd1304364b0708f056f72b2..d36a2c31faf9dad97f0cc8034b7e9559ec1b82fd 100644
--- a/ui/native_theme/native_theme_base.cc
+++ b/ui/native_theme/native_theme_base.cc
@@ -600,11 +600,11 @@
   SkColor colors[3] = {startEndColors[0], startEndColors[0], startEndColors[1]};
   cc::PaintFlags flags;
   flags.setAntiAlias(true);
-  flags.setShader(cc::PaintShader::MakeLinearGradient(
-      gradient_bounds, colors, nullptr, 3, SkShader::kClamp_TileMode));
+  flags.setShader(cc::WrapSkShader(SkGradientShader::MakeLinear(
+      gradient_bounds, colors, NULL, 3, SkShader::kClamp_TileMode)));
   flags.setStyle(cc::PaintFlags::kFill_Style);
   canvas->drawRoundRect(skrect, borderRadius, borderRadius, flags);
-  flags.setShader(nullptr);
+  flags.setShader(NULL);
 
   // Draw the border.
   if (state == kHovered)
@@ -681,11 +681,11 @@
 
   flags.setStyle(cc::PaintFlags::kFill_Style);
   flags.setAntiAlias(true);
-  flags.setShader(cc::PaintShader::MakeLinearGradient(
-      gradient_bounds, colors, nullptr, 2, SkShader::kClamp_TileMode));
+  flags.setShader(cc::WrapSkShader(SkGradientShader::MakeLinear(
+      gradient_bounds, colors, NULL, 2, SkShader::kClamp_TileMode)));
 
   canvas->drawRoundRect(skrect, SkIntToScalar(1), SkIntToScalar(1), flags);
-  flags.setShader(nullptr);
+  flags.setShader(NULL);
 
   if (button.has_border) {
     int border_alpha = state == kHovered ? 0x80 : 0x55;