Update from https://crrev.com/309717

skia/ext/pixel_ref_utils_unittest.cc

 // Copyright 2014 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 "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/test/geometry_test_utils.h"
 #include "skia/ext/pixel_ref_utils.h"
 #include "skia/ext/refptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 29 matching lines @@
     if (bitmap)
       *bitmap = bitmap_;
     return SkShader::kDefault_BitmapType;
   }
 
   // not indended to return an actual context. Just need to supply this.
   size_t contextSize() const override { return sizeof(SkShader::Context); }
 
   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_;
 };
 
 SkFlattenable* TestDiscardableShader::CreateProc(SkReadBuffer&) {
   return new TestDiscardableShader;
 }
 
 void CreateBitmap(gfx::Size size, const char* uri, SkBitmap* bitmap) {
@@ skipping 595 matching lines @@
   EXPECT_EQ(3u, pixel_refs.size());
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(10, 10, 90, 90),
                        gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect));
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(10, 10, 40, 40),
                        gfx::SkRectToRectF(pixel_refs[1].pixel_ref_rect));
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(50, 55, 150, 145),
                        gfx::SkRectToRectF(pixel_refs[2].pixel_ref_rect));
 }
 
 }  // namespace skia