Re-enable canvas optimization for getImageData with new codepath

third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp

Index: third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp
diff --git a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp
index 01c9befbbc9003403f1eb34376d99f5450c4e246..93d11b0cc1ab3fd2b60f7cca2fca83c8938c6495 100644
--- a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp
+++ b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp
@@ -779,7 +779,7 @@ TEST_F(CanvasRenderingContext2DTest, GetImageDataDisablesAcceleration)
     std::unique_ptr<Canvas2DImageBufferSurface> surface(new Canvas2DImageBufferSurface(bridge, size));
     canvasElement().createImageBufferUsingSurfaceForTesting(std::move(surface));
 
-    EXPECT_TRUE(bridge->isAccelerated());
+    EXPECT_TRUE(canvasElement().buffer()->isAccelerated());
     EXPECT_EQ(1u, getGlobalAcceleratedImageBufferCount());
     EXPECT_EQ(720000, getGlobalGPUMemoryUsage());
 
@@ -788,11 +788,11 @@ TEST_F(CanvasRenderingContext2DTest, GetImageDataDisablesAcceleration)
 
     EXPECT_FALSE(exceptionState.hadException());
     if (ExpensiveCanvasHeuristicParameters::GetImageDataForcesNoAcceleration) {
-        EXPECT_FALSE(bridge->isAccelerated());
+        EXPECT_FALSE(canvasElement().buffer()->isAccelerated());
         EXPECT_EQ(0u, getGlobalAcceleratedImageBufferCount());
         EXPECT_EQ(0, getGlobalGPUMemoryUsage());
     } else {
-        EXPECT_TRUE(bridge->isAccelerated());
+        EXPECT_TRUE(canvasElement().buffer()->isAccelerated());
         EXPECT_EQ(1u, getGlobalAcceleratedImageBufferCount());
         EXPECT_EQ(720000, getGlobalGPUMemoryUsage());
     }