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

services/fake_surfaces/fake_surfaces_service_application.h

Index: services/fake_surfaces/fake_surfaces_service_application.h
diff --git a/services/fake_surfaces/fake_surfaces_service_application.h b/services/fake_surfaces/fake_surfaces_service_application.h
index 9058cff0e5c3e8232379cc543b20eeea94cfb883..43a7c048b6aa630546f1e40d4416fe27fb579fa8 100644
--- a/services/fake_surfaces/fake_surfaces_service_application.h
+++ b/services/fake_surfaces/fake_surfaces_service_application.h
@@ -9,6 +9,7 @@
 #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 "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
 
 namespace mojo {
@@ -19,6 +20,7 @@ namespace fake_surfaces {
 
 class FakeSurfacesServiceApplication
     : public mojo::ApplicationDelegate,
+      public mojo::InterfaceFactory<mojo::DisplayFactory>,
       public mojo::InterfaceFactory<mojo::Surface> {
  public:
   FakeSurfacesServiceApplication();
@@ -29,6 +31,10 @@ class FakeSurfacesServiceApplication
   bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) override;
 
+  // InterfaceFactory<mojo::DisplayFactory> implementation.
+  void Create(mojo::ApplicationConnection* connection,
+              mojo::InterfaceRequest<mojo::DisplayFactory> request) override;
+
   // InterfaceFactory<mojo::Surface> implementation.
   void Create(mojo::ApplicationConnection* connection,
               mojo::InterfaceRequest<mojo::Surface> request) override;