1 files changed, 10 insertions, 11 deletions
diff --git a/chromium/ui/snapshot/snapshot_aura.cc b/chromium/ui/snapshot/snapshot_aura.cc
index 10328ee7fc3..40b59a110a0 100644
--- a/chromium/ui/snapshot/snapshot_aura.cc
+++ b/chromium/ui/snapshot/snapshot_aura.cc
@@ -4,13 +4,14 @@
 
 #include "ui/snapshot/snapshot_aura.h"
 
+#include <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/ptr_util.h"
 #include "base/task_runner_util.h"
-#include "cc/output/copy_output_request.h"
+#include "components/viz/common/quads/copy_output_request.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tracker.h"
@@ -31,9 +32,9 @@ bool GrabWindowSnapshotAura(aura::Window* window,
 static void MakeAsyncCopyRequest(
     Layer* layer,
     const gfx::Rect& source_rect,
-    cc::CopyOutputRequest::CopyOutputRequestCallback callback) {
-  std::unique_ptr<cc::CopyOutputRequest> request =
-      cc::CopyOutputRequest::CreateBitmapRequest(std::move(callback));
+    viz::CopyOutputRequest::CopyOutputRequestCallback callback) {
+  std::unique_ptr<viz::CopyOutputRequest> request =
+      viz::CopyOutputRequest::CreateBitmapRequest(std::move(callback));
   request->set_area(source_rect);
   layer->RequestCopyOfOutput(std::move(request));
 }
@@ -41,9 +42,9 @@ static void MakeAsyncCopyRequest(
 static void FinishedAsyncCopyRequest(
     std::unique_ptr<aura::WindowTracker> tracker,
     const gfx::Rect& source_rect,
-    cc::CopyOutputRequest::CopyOutputRequestCallback callback,
+    viz::CopyOutputRequest::CopyOutputRequestCallback callback,
     int retry_count,
-    std::unique_ptr<cc::CopyOutputResult> result) {
+    std::unique_ptr<viz::CopyOutputResult> result) {
   static const int kMaxRetries = 5;
   // Retry the copy request if the previous one failed for some reason.
   if (!tracker->windows().empty() && (retry_count < kMaxRetries) &&
@@ -67,7 +68,7 @@ static void FinishedAsyncCopyRequest(
 static void MakeInitialAsyncCopyRequest(
     aura::Window* window,
     const gfx::Rect& source_rect,
-    cc::CopyOutputRequest::CopyOutputRequestCallback callback) {
+    viz::CopyOutputRequest::CopyOutputRequestCallback callback) {
   auto tracker = base::MakeUnique<aura::WindowTracker>();
   tracker->Add(window);
   MakeAsyncCopyRequest(
@@ -80,12 +81,11 @@ void GrabWindowSnapshotAndScaleAsyncAura(
     aura::Window* window,
     const gfx::Rect& source_rect,
     const gfx::Size& target_size,
-    scoped_refptr<base::TaskRunner> background_task_runner,
     const GrabWindowSnapshotAsyncCallback& callback) {
   MakeInitialAsyncCopyRequest(
       window, source_rect,
       base::BindOnce(&SnapshotAsync::ScaleCopyOutputResult, callback,
-                     target_size, background_task_runner));
+                     target_size));
 }
 
 void GrabWindowSnapshotAsyncAura(
@@ -116,10 +116,9 @@ void GrabWindowSnapshotAndScaleAsync(
     gfx::NativeWindow window,
     const gfx::Rect& source_rect,
     const gfx::Size& target_size,
-    scoped_refptr<base::TaskRunner> background_task_runner,
     const GrabWindowSnapshotAsyncCallback& callback) {
   GrabWindowSnapshotAndScaleAsyncAura(window, source_rect, target_size,
-                                      background_task_runner, callback);
+                                      callback);
 }
 
 void GrabWindowSnapshotAsync(gfx::NativeWindow window,