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

content/renderer/image_capture/image_capture_frame_grabber.cc

 // 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 "content/renderer/image_capture/image_capture_frame_grabber.h"
 
 #include "cc/paint/paint_canvas.h"
+#include "cc/paint/paint_surface.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/video_frame.h"
 #include "media/base/video_util.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/public/platform/WebCallbacks.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
 #include "third_party/libyuv/include/libyuv.h"
 #include "third_party/skia/include/core/SkImage.h"
-#include "third_party/skia/include/core/SkSurface.h"
 
 namespace content {
 
 using blink::WebImageCaptureGrabFrameCallbacks;
 
 namespace {
 
 void OnError(std::unique_ptr<WebImageCaptureGrabFrameCallbacks> callbacks) {
   callbacks->onError();
 }
@@ skipping 127 matching lines @@
 
   MediaStreamVideoSink::DisconnectFromTrack();
   frame_grab_in_progress_ = false;
   if (image)
     callbacks.PassCallbacks()->onSuccess(image);
   else
     callbacks.PassCallbacks()->onError();
 }
 
 }  // namespace content