Move const ResourceProvider members into Settings struct

cc/test/pixel_test.cc

Index: cc/test/pixel_test.cc
diff --git a/cc/test/pixel_test.cc b/cc/test/pixel_test.cc
index 735d0f32be0f48f77dca73ee9f4c41ceb7a056fd..bcf495b01ada0c9f79e681ff7c412062da4cb596 100644
--- a/cc/test/pixel_test.cc
+++ b/cc/test/pixel_test.cc
@@ -134,7 +134,7 @@ void PixelTest::SetUpGLRenderer(bool use_skia_gpu_backend,
   bool delegated_sync_points_required = false;
   resource_provider_ = base::MakeUnique<ResourceProvider>(
       output_surface_->context_provider(), shared_bitmap_manager_.get(),
-      gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0, 1,
+      gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 1,
       delegated_sync_points_required,
       settings_.renderer_settings.use_gpu_memory_buffer_resources,
       settings_.enable_color_correct_rendering,
@@ -163,7 +163,7 @@ void PixelTest::SetUpSoftwareRenderer() {
   bool delegated_sync_points_required = false;  // Meaningless for software.
   resource_provider_ = base::MakeUnique<ResourceProvider>(
       nullptr, shared_bitmap_manager_.get(), gpu_memory_buffer_manager_.get(),
-      main_thread_task_runner_.get(), 0, 1, delegated_sync_points_required,
+      main_thread_task_runner_.get(), 1, delegated_sync_points_required,
       settings_.renderer_settings.use_gpu_memory_buffer_resources,
       settings_.enable_color_correct_rendering,
       settings_.renderer_settings.buffer_to_texture_target_map);