Revert of cc/paint: Remove cc::PaintSurface.

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

 // Copyright 2016 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 "modules/canvas2d/CanvasRenderingContext2D.h"
 
 #include "core/dom/Document.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/ImageData.h"
 #include "core/loader/EmptyClients.h"
 #include "core/testing/DummyPageHolder.h"
 #include "modules/accessibility/AXObject.h"
 #include "modules/accessibility/AXObjectCacheImpl.h"
 #include "modules/canvas2d/CanvasGradient.h"
 #include "modules/canvas2d/CanvasPattern.h"
 #include "modules/canvas2d/HitRegionOptions.h"
 #include "modules/canvas2d/Path2D.h"
 #include "modules/webgl/WebGLRenderingContext.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/graphics/StaticBitmapImage.h"
 #include "platform/graphics/UnacceleratedImageBufferSurface.h"
 #include "platform/loader/fetch/MemoryCache.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/skia/include/core/SkSurface.h"
 
 using ::testing::Mock;
 
 namespace blink {
 namespace UsageTrackingTests {
 
 enum BitmapOpacity { OpaqueBitmap, TransparentBitmap };
 
 class FakeImageSource : public CanvasImageSource {
  public:
@@ skipping 633 matching lines @@
   for (int i = 0; i < numReps; i++) {
     context2d()->fillRect(10, 10, 100, 100);
   }
   EXPECT_EQ(
       numReps,
       context2d()->getUsage().numDrawCalls[BaseRenderingContext2D::FillRect]);
 }
 
 }  // namespace UsageTrackingTests
 }  // namespace blink