Add a Display and ContextProvider concept to mojom, use to recreate

services/surfaces/surfaces_service_application.cc

 // Copyright 2014 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 "services/surfaces/surfaces_service_application.h"
 
 #include "cc/surfaces/display.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/public/c/system/main.h"
+#include "services/surfaces/display_factory_impl.h"
 #include "services/surfaces/surfaces_impl.h"
 
 namespace surfaces {
 
 SurfacesServiceApplication::SurfacesServiceApplication()
     : next_id_namespace_(1u), display_(nullptr) {
 }
 
 SurfacesServiceApplication::~SurfacesServiceApplication() {
 }
 
 void SurfacesServiceApplication::Initialize(mojo::ApplicationImpl* app) {
   tracing_.Initialize(app);
   scheduler_.reset(new SurfacesScheduler(this));
 }
 
 bool SurfacesServiceApplication::ConfigureIncomingConnection(
     mojo::ApplicationConnection* connection) {
-  connection->AddService(this);
+  connection->AddService<mojo::DisplayFactory>(this);
+  connection->AddService<mojo::Surface>(this);
   return true;
 }
 
 void SurfacesServiceApplication::Create(
     mojo::ApplicationConnection* connection,
+    mojo::InterfaceRequest<mojo::DisplayFactory> request) {
+  new DisplayFactoryImpl(&manager_, next_id_namespace_++, this, request.Pass());
+}
+
+void SurfacesServiceApplication::Create(
+    mojo::ApplicationConnection* connection,
     mojo::InterfaceRequest<mojo::Surface> request) {
   new SurfacesImpl(&manager_, next_id_namespace_++, this, request.Pass());
 }
 
 void SurfacesServiceApplication::OnVSyncParametersUpdated(
     base::TimeTicks timebase,
     base::TimeDelta interval) {
   scheduler_->OnVSyncParametersUpdated(timebase, interval);
 }
 
@@ skipping 15 matching lines @@
     display_->Draw();
 }
 
 }  // namespace surfaces
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(
       new surfaces::SurfacesServiceApplication);
   return runner.Run(shell_handle);
 }