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..092696fa815ffcf6944cd90ea93b09006c1918d5 100644
--- a/services/surfaces/surfaces_service_application.h
+++ b/services/surfaces/surfaces_service_application.h
@@ -6,25 +6,24 @@
 #define SERVICES_SURFACES_SURFACES_SERVICE_APPLICATION_H_
 
 #include "base/macros.h"
-#include "base/timer/timer.h"
 #include "cc/surfaces/surface_manager.h"
 #include "mojo/common/tracing_impl.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/interface_factory.h"
-#include "services/surfaces/surfaces_impl.h"
-#include "services/surfaces/surfaces_scheduler.h"
+#include "mojo/services/surfaces/public/interfaces/display.mojom.h"
+#include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
 
 namespace mojo {
 class ApplicationConnection;
 }
 
 namespace surfaces {
+class SurfacesScheduler;
 
 class SurfacesServiceApplication
     : public mojo::ApplicationDelegate,
-      public mojo::InterfaceFactory<mojo::Surface>,
-      public SurfacesImpl::Client,
-      public SurfacesScheduler::Client {
+      public mojo::InterfaceFactory<mojo::DisplayFactory>,
+      public mojo::InterfaceFactory<mojo::Surface> {
  public:
   SurfacesServiceApplication();
   ~SurfacesServiceApplication() override;
@@ -34,24 +33,17 @@ 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.
-  void OnVSyncParametersUpdated(base::TimeTicks timebase,
-                                base::TimeDelta interval) override;
-  void FrameSubmitted() override;
-  void SetDisplay(cc::Display*) override;
-  void OnDisplayBeingDestroyed(cc::Display* display) override;
-
-  // SurfacesScheduler::Client
-  void Draw() override;
-
  private:
   cc::SurfaceManager manager_;
   uint32_t next_id_namespace_;
-  cc::Display* display_;
   scoped_ptr<SurfacesScheduler> scheduler_;
   mojo::TracingImpl tracing_;