Update from https://crrev.com/312398

skia/ext/vector_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.
 
 #include "build/build_config.h"
 
 #if !defined(OS_WIN)
 #include <unistd.h>
 #endif
 
@@ skipping 432 matching lines @@
 
   // When true (default), vcanvas_ and pcanvas_ contents are compared and
   // verified to be identical.
   bool compare_canvas_;
 };
 
 
 ////////////////////////////////////////////////////////////////////////////////
 // Actual tests
 
+#if !defined(USE_AURA)  // http://crbug.com/154358
+
 TEST_F(VectorCanvasTest, BasicDrawing) {
   EXPECT_EQ(Image(*vcanvas_).PercentageDifferent(Image(*pcanvas_)), 0.)
       << L"clean";
   EXPECT_EQ(0., ProcessImage(FILE_PATH_LITERAL("clean")));
 
   // Clear white.
   {
     vcanvas_->drawARGB(255, 255, 255, 255, SkXfermode::kSrc_Mode);
     pcanvas_->drawARGB(255, 255, 255, 255, SkXfermode::kSrc_Mode);
   }
@@ skipping 493 matching lines @@
 
   {
     vcanvas_->rotate(67);
     pcanvas_->rotate(67);
     vcanvas_->drawBitmap(bitmap, 20, -50, NULL);
     pcanvas_->drawBitmap(bitmap, 20, -50, NULL);
     EXPECT_EQ(0., ProcessImage(FILE_PATH_LITERAL("rotate")));
   }
 }
 
+#endif  // !defined(USE_AURA)
+
 }  // namespace skia