Mandoline: Merge Surfaces and Views apps

components/view_manager/view_manager_root_impl.cc

Index: components/view_manager/view_manager_root_impl.cc
diff --git a/components/view_manager/view_manager_root_impl.cc b/components/view_manager/view_manager_root_impl.cc
index 00dc13374554cfbbd0d2f7a105a90214dc545eb4..10cc3aa5b6de078c88222b4e19a755fb2efb351d 100644
--- a/components/view_manager/view_manager_root_impl.cc
+++ b/components/view_manager/view_manager_root_impl.cc
@@ -16,11 +16,15 @@ ViewManagerRootImpl::ViewManagerRootImpl(
     ConnectionManager* connection_manager,
     bool is_headless,
     mojo::ApplicationImpl* app_impl,
-    const scoped_refptr<gles2::GpuState>& gpu_state)
+    const scoped_refptr<gles2::GpuState>& gpu_state,
+    const scoped_refptr<surfaces::SurfacesState>& surfaces_state)
     : delegate_(nullptr),
       connection_manager_(connection_manager),
       display_manager_(
-          DisplayManager::Create(is_headless, app_impl, gpu_state)) {
+          DisplayManager::Create(is_headless,
+                                 app_impl,
+                                 gpu_state,
+                                 surfaces_state)) {
   display_manager_->Init(this);
 }