Fix MultiPictureDraw issues with GpuImageDecodeController

cc/raster/raster_buffer_provider_unittest.cc

 // Copyright 2013 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 "cc/raster/raster_buffer_provider.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 47 matching lines @@
   TestRasterTaskImpl(const Resource* resource,
                      const Reply& reply,
                      TileTask::Vector* dependencies)
       : TileTask(true, dependencies),
         resource_(resource),
         reply_(reply),
         raster_source_(FakeRasterSource::CreateFilled(gfx::Size(1, 1))) {}
 
   // Overridden from Task:
   void RunOnWorkerThread() override {
+    // Don't use the image hijack canvas for these tests, as they have no image
+    // decode controller.
+    RasterSource::PlaybackSettings settings;
+    settings.use_image_hijack_canvas = false;
+
     uint64_t new_content_id = 0;
     raster_buffer_->Playback(raster_source_.get(), gfx::Rect(1, 1),
-                             gfx::Rect(1, 1), new_content_id, 1.f,
-                             RasterSource::PlaybackSettings());
+                             gfx::Rect(1, 1), new_content_id, 1.f, settings);
   }
 
   // Overridden from TileTask:
   void ScheduleOnOriginThread(RasterBufferProvider* provider) override {
     // The raster buffer has no tile ids associated with it for partial update,
     // so doesn't need to provide a valid dirty rect.
     raster_buffer_ = provider->AcquireBufferForRaster(resource_, 0, 0);
   }
   void CompleteOnOriginThread(RasterBufferProvider* provider) override {
     provider->ReleaseBufferForRaster(std::move(raster_buffer_));
@@ skipping 286 matching lines @@
 
 INSTANTIATE_TEST_CASE_P(RasterBufferProviderTests,
                         RasterBufferProviderTest,
                         ::testing::Values(RASTER_BUFFER_PROVIDER_TYPE_ZERO_COPY,
                                           RASTER_BUFFER_PROVIDER_TYPE_ONE_COPY,
                                           RASTER_BUFFER_PROVIDER_TYPE_GPU,
                                           RASTER_BUFFER_PROVIDER_TYPE_BITMAP));
 
 }  // namespace
 }  // namespace cc