Update from https://crrev.com/309717

skia/ext/pixel_ref_utils_unittest.cc

Index: skia/ext/pixel_ref_utils_unittest.cc
diff --git a/skia/ext/pixel_ref_utils_unittest.cc b/skia/ext/pixel_ref_utils_unittest.cc
index 08e5d3e0184b645d3efba12ca36b585981c1ddd5..414a3ce76b2306cf728efcc13a3b0dcaff578f55 100644
--- a/skia/ext/pixel_ref_utils_unittest.cc
+++ b/skia/ext/pixel_ref_utils_unittest.cc
@@ -47,7 +47,15 @@ class TestDiscardableShader : public SkShader {
 
   void flatten(SkWriteBuffer&) const override {}
 
-  SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(TestDiscardableShader);
+  // Manual expansion of SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS to
+  // satisfy Chrome's style checker, since Skia isn't ready to make the C++11
+  // leap yet.
+ private:
+  static SkFlattenable* CreateProc(SkReadBuffer&);
+  friend class SkPrivateEffectInitializer;
+
+ public:
+  Factory getFactory() const override { return CreateProc; }
 
  private:
   SkBitmap bitmap_;