cc: Allow TestDelegatingOutputSurface to be used for non-pixel tests.

android_webview/browser/surfaces_instance.cc

Index: android_webview/browser/surfaces_instance.cc
diff --git a/android_webview/browser/surfaces_instance.cc b/android_webview/browser/surfaces_instance.cc
index b796730f1e8b079cbb66f3a03037b5bb3f77f5ca..d7b2647c52e4b0ef0b6dc68874fa3dbf9c450bb8 100644
--- a/android_webview/browser/surfaces_instance.cc
+++ b/android_webview/browser/surfaces_instance.cc
@@ -66,12 +66,12 @@ SurfacesInstance::SurfacesInstance()
       begin_frame_source.get(), nullptr,
       output_surface_holder->capabilities().max_frames_pending));
   display_.reset(new cc::Display(
-      surface_manager_.get(), nullptr /* shared_bitmap_manager */,
+      nullptr /* shared_bitmap_manager */,
       nullptr /* gpu_memory_buffer_manager */, settings,
-      surface_id_allocator_->client_id(), std::move(begin_frame_source),
-      std::move(output_surface_holder), std::move(scheduler),
-      std::move(texture_mailbox_deleter)));
-  display_->Initialize(this);
+      std::move(begin_frame_source), std::move(output_surface_holder),
+      std::move(scheduler), std::move(texture_mailbox_deleter)));
+  display_->Initialize(this, surface_manager_.get(),
+                       surface_id_allocator_->client_id());
 
   surface_factory_.reset(new cc::SurfaceFactory(surface_manager_.get(), this));