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

services/surfaces/surfaces_service_application.cc

Index: services/surfaces/surfaces_service_application.cc
diff --git a/services/surfaces/surfaces_service_application.cc b/services/surfaces/surfaces_service_application.cc
index 107261764dbf92f677bc34899f469f5f0a62573a..d225558dd52b8fe3fd53db275847d9d99f2d6696 100644
--- a/services/surfaces/surfaces_service_application.cc
+++ b/services/surfaces/surfaces_service_application.cc
@@ -7,6 +7,7 @@
 #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 {
@@ -25,12 +26,19 @@ void SurfacesServiceApplication::Initialize(mojo::ApplicationImpl* app) {
 
 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());
 }