Introduce Display Compositor mojo interface. Use InProcessContextProvider.

services/ui/surfaces/direct_output_surface.h

Index: services/ui/surfaces/direct_output_surface.h
diff --git a/services/ui/surfaces/direct_output_surface.h b/services/ui/surfaces/direct_output_surface.h
index 31f946d6f5f74e015116585c9e88734061cc31e7..dd280cf0ddd45a0b0db524b2ad73f49bdd6a23c3 100644
--- a/services/ui/surfaces/direct_output_surface.h
+++ b/services/ui/surfaces/direct_output_surface.h
@@ -7,9 +7,8 @@
 
 #include <memory>
 
+#include "cc/output/in_process_context_provider.h"
 #include "cc/output/output_surface.h"
-#include "services/ui/surfaces/surfaces_context_provider.h"
-#include "services/ui/surfaces/surfaces_context_provider_delegate.h"
 
 namespace cc {
 class CompositorFrame;
@@ -20,11 +19,10 @@ namespace ui {
 
 // An OutputSurface implementation that directly draws and
 // swaps to an actual GL surface.
-class DirectOutputSurface : public cc::OutputSurface,
-                            public SurfacesContextProviderDelegate {
+class DirectOutputSurface : public cc::OutputSurface {
  public:
   DirectOutputSurface(
-      scoped_refptr<SurfacesContextProvider> context_provider,
+      scoped_refptr<cc::InProcessContextProvider> context_provider,
       cc::SyntheticBeginFrameSource* synthetic_begin_frame_source);
   ~DirectOutputSurface() override;
 
@@ -46,12 +44,11 @@ class DirectOutputSurface : public cc::OutputSurface,
   bool HasExternalStencilTest() const override;
   void ApplyExternalStencil() override;
 
-  // SurfacesContextProviderDelegate implementation
-  void OnVSyncParametersUpdated(const base::TimeTicks& timebase,
-                                const base::TimeDelta& interval) override;
 
  private:
   void OnSwapBuffersComplete();
+  void OnVSyncParametersUpdated(const base::TimeTicks& timebase,
+                                const base::TimeDelta& interval);
 
   cc::OutputSurfaceClient* client_ = nullptr;
   cc::SyntheticBeginFrameSource* const synthetic_begin_frame_source_;