Update from https://crrev.com/312398

skia/ext/platform_canvas_unittest.cc

Index: skia/ext/platform_canvas_unittest.cc
diff --git a/skia/ext/platform_canvas_unittest.cc b/skia/ext/platform_canvas_unittest.cc
index a7dfb69be510fe3fd7525c0b1d4da11f8acc3517..9ab5667127b36605e639cc1dbb4468a416db1c65 100644
--- a/skia/ext/platform_canvas_unittest.cc
+++ b/skia/ext/platform_canvas_unittest.cc
@@ -207,6 +207,8 @@ TEST(PlatformCanvas, SkLayer) {
   EXPECT_TRUE(VerifyBlackRect(*canvas, kLayerX, kLayerY, kLayerW, kLayerH));
 }
 
+#if !defined(USE_AURA)  // http://crbug.com/154358
+
 // Test native clipping.
 TEST(PlatformCanvas, ClipRegion) {
   // Initialize a white canvas
@@ -232,6 +234,8 @@ TEST(PlatformCanvas, ClipRegion) {
   EXPECT_TRUE(VerifyCanvasColor(*canvas, SK_ColorWHITE));
 }
 
+#endif  // !defined(USE_AURA)
+
 // Test the layers get filled properly by native rendering.
 TEST(PlatformCanvas, FillLayer) {
   // Create the canvas initialized to opaque white.
@@ -289,6 +293,8 @@ TEST(PlatformCanvas, FillLayer) {
   EXPECT_TRUE(VerifyBlackRect(*canvas, kInnerX, kInnerY, kInnerW, kInnerH));
 }
 
+#if !defined(USE_AURA)  // http://crbug.com/154358
+
 // Test that translation + make layer works properly.
 TEST(PlatformCanvas, TranslateLayer) {
   // Create the canvas initialized to opaque white.
@@ -389,6 +395,8 @@ TEST(PlatformCanvas, TranslateLayer) {
 #endif
 }
 
+#endif  // #if !defined(USE_AURA)
+
 TEST(PlatformBitmapTest, PlatformBitmap) {
   const int kWidth = 400;
   const int kHeight = 300;