Index: cc/resources/raster_worker_pool_unittest.cc |
diff --git a/cc/resources/raster_worker_pool_unittest.cc b/cc/resources/raster_worker_pool_unittest.cc |
index 3c39c05b0ef4426bac0c34421b544c68fc6e7ac6..7b14eaa685ce56fe5274e89f85d24b253bb5952c 100644 |
--- a/cc/resources/raster_worker_pool_unittest.cc |
+++ b/cc/resources/raster_worker_pool_unittest.cc |
@@ -22,6 +22,7 @@ |
#include "cc/resources/zero_copy_raster_worker_pool.h" |
#include "cc/test/fake_output_surface.h" |
#include "cc/test/fake_output_surface_client.h" |
+#include "cc/test/test_gpu_memory_buffer_manager.h" |
#include "cc/test/test_shared_bitmap_manager.h" |
#include "cc/test/test_web_graphics_context_3d.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -269,9 +270,14 @@ class RasterWorkerPoolTest |
CHECK(output_surface_->BindToClient(&output_surface_client_)); |
TestWebGraphicsContext3D* context3d = context_provider_->TestContext3d(); |
context3d->set_support_sync_query(true); |
- resource_provider_ = |
- ResourceProvider::Create( |
- output_surface_.get(), NULL, NULL, 0, false, 1, false).Pass(); |
+ resource_provider_ = ResourceProvider::Create(output_surface_.get(), |
+ NULL, |
+ &gpu_memory_buffer_manager_, |
+ NULL, |
+ 0, |
+ false, |
+ 1, |
+ false).Pass(); |
} |
void CreateSoftwareOutputSurfaceAndResourceProvider() { |
@@ -281,6 +287,7 @@ class RasterWorkerPoolTest |
resource_provider_ = ResourceProvider::Create(output_surface_.get(), |
&shared_bitmap_manager_, |
NULL, |
+ NULL, |
0, |
false, |
1, |
@@ -309,6 +316,7 @@ class RasterWorkerPoolTest |
scoped_ptr<ResourceProvider> resource_provider_; |
scoped_ptr<ResourcePool> staging_resource_pool_; |
scoped_ptr<RasterWorkerPool> raster_worker_pool_; |
+ TestGpuMemoryBufferManager gpu_memory_buffer_manager_; |
TestSharedBitmapManager shared_bitmap_manager_; |
base::CancelableClosure timeout_; |
int timeout_seconds_; |
@@ -334,7 +342,6 @@ TEST_P(RasterWorkerPoolTest, FailedMapResource) { |
return; |
TestWebGraphicsContext3D* context3d = context_provider_->TestContext3d(); |
- context3d->set_times_map_image_chromium_succeeds(0); |
context3d->set_times_map_buffer_chromium_succeeds(0); |
AppendTask(0u); |
ScheduleTasks(); |