Update from https://crrev.com/312398

skia/ext/platform_canvas_unittest.cc

 // Copyright (c) 2012 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.
 
 // TODO(awalker): clean up the const/non-const reference handling in this test
 
 #include "skia/ext/platform_canvas.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 189 matching lines @@
 
   // Make a layer and fill it completely to make sure that the bounds are
   // correct.
   {
     LayerSaver layer(*canvas, kLayerX, kLayerY, kLayerW, kLayerH);
     canvas->drawColor(SK_ColorBLACK);
   }
   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
   RefPtr<SkCanvas> canvas = AdoptRef(CreatePlatformCanvas(16, 16, true));
   canvas->drawColor(SK_ColorWHITE);
   EXPECT_TRUE(VerifyCanvasColor(*canvas, SK_ColorWHITE));
 
   // Test that initially the canvas has no clip region, by filling it
   // with a black rectangle.
   // Note: Don't use LayerSaver, since internally it sets a clip region.
   DrawNativeRect(*canvas, 0, 0, 16, 16);
   EXPECT_TRUE(VerifyCanvasColor(*canvas, SK_ColorBLACK));
 
   // Test that intersecting disjoint clip rectangles sets an empty clip region
   canvas->drawColor(SK_ColorWHITE);
   EXPECT_TRUE(VerifyCanvasColor(*canvas, SK_ColorWHITE));
   {
     LayerSaver layer(*canvas, 0, 0, 16, 16);
     AddClip(*canvas, 2, 3, 4, 5);
     AddClip(*canvas, 4, 9, 10, 10);
     DrawNativeRect(*canvas, 0, 0, 16, 16);
   }
   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.
   RefPtr<SkCanvas> canvas = AdoptRef(CreatePlatformCanvas(16, 16, true));
 
   // Make a layer and fill it completely to make sure that the bounds are
   // correct.
   canvas->drawColor(SK_ColorWHITE);
   {
     LayerSaver layer(*canvas, kLayerX, kLayerY, kLayerW, kLayerH);
@@ skipping 37 matching lines @@
     LayerSaver layer(*canvas, kLayerX, kLayerY, kLayerW, kLayerH);
     DrawNativeRect(*canvas, 0, 0, 100, 100);
 #if defined(OS_WIN)
     MakeOpaque(canvas.get(), 0, 0, 100, 100);
 #endif
   }
   canvas->restore();
   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.
   RefPtr<SkCanvas> canvas = AdoptRef(CreatePlatformCanvas(16, 16, true));
 
   // Make a layer and fill it completely to make sure that the bounds are
   // correct.
   canvas->drawColor(SK_ColorWHITE);
   canvas->save();
   canvas->translate(1, 1);
@@ skipping 80 matching lines @@
 #if defined(OS_WIN)
     MakeOpaque(canvas.get(), kLayerX, kLayerY, kLayerW, kLayerH);
 #endif
   }
   canvas->restore();
   EXPECT_TRUE(VerifyRoundedRect(*canvas, SK_ColorWHITE, SK_ColorBLACK,
                                 kInnerX + 1, kInnerY + 1, kInnerW, kInnerH));
 #endif
 }
 
+#endif  // #if !defined(USE_AURA)
+
 TEST(PlatformBitmapTest, PlatformBitmap) {
   const int kWidth = 400;
   const int kHeight = 300;
   scoped_ptr<PlatformBitmap> platform_bitmap(new PlatformBitmap);
 
   EXPECT_TRUE(0 == platform_bitmap->GetSurface());
   EXPECT_TRUE(platform_bitmap->GetBitmap().empty());
   EXPECT_TRUE(platform_bitmap->GetBitmap().isNull());
 
   EXPECT_TRUE(platform_bitmap->Allocate(kWidth, kHeight, /*is_opaque=*/false));
@@ skipping 40 matching lines @@
 
   sk_bitmap.lockPixels();
   EXPECT_EQ(0xDEED1020, *sk_bitmap.getAddr32(10, 20));
   EXPECT_EQ(0xDEED2030, *sk_bitmap.getAddr32(20, 30));
   EXPECT_EQ(0xDEED3040, *sk_bitmap.getAddr32(30, 40));
   sk_bitmap.unlockPixels();
 }
 
 
 }  // namespace skia