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

services/surfaces/surfaces_service_application.h

Index: services/surfaces/surfaces_service_application.h
diff --git a/services/surfaces/surfaces_service_application.h b/services/surfaces/surfaces_service_application.h
index d3d9fa82c21656f0021bb39a15b5012085458073..8ab60d0e0cc66d3bf2e2bafb8376dda045fcc8d1 100644
--- a/services/surfaces/surfaces_service_application.h
+++ b/services/surfaces/surfaces_service_application.h
@@ -11,6 +11,8 @@
 #include "mojo/common/tracing_impl.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/interface_factory.h"
+#include "mojo/services/surfaces/public/interfaces/display.mojom.h"
+#include "services/surfaces/display_impl.h"
 #include "services/surfaces/surfaces_impl.h"
 #include "services/surfaces/surfaces_scheduler.h"
 
@@ -22,7 +24,9 @@ namespace surfaces {
 
 class SurfacesServiceApplication
     : public mojo::ApplicationDelegate,
+      public mojo::InterfaceFactory<mojo::DisplayFactory>,
       public mojo::InterfaceFactory<mojo::Surface>,
+      public DisplayImpl::Client,
       public SurfacesImpl::Client,
       public SurfacesScheduler::Client {
  public:
@@ -34,11 +38,15 @@ class SurfacesServiceApplication
   bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) override;
 
+  // InterfaceFactory<DisplayFactory> implementation.
+  void Create(mojo::ApplicationConnection* connection,
+              mojo::InterfaceRequest<mojo::DisplayFactory> request) override;
+
   // InterfaceFactory<Surface> implementation.
   void Create(mojo::ApplicationConnection* connection,
               mojo::InterfaceRequest<mojo::Surface> request) override;
 
-  // SurfacesImpl::Client implementation.
+  // DisplayImpl::Client implementation.
   void OnVSyncParametersUpdated(base::TimeTicks timebase,
                                 base::TimeDelta interval) override;
   void FrameSubmitted() override;