ui + mus: Split ContextFactory into ContextFactory(Client) and ContextFactoryPrivate

ui/views/mus/surface_context_factory.h

Index: ui/views/mus/surface_context_factory.h
diff --git a/ui/views/mus/surface_context_factory.h b/ui/views/mus/surface_context_factory.h
index c8561951140aa648ceef8198fea80147bca7adb0..3abc9c9fa65c921d588ef89670cf977bcf371801 100644
--- a/ui/views/mus/surface_context_factory.h
+++ b/ui/views/mus/surface_context_factory.h
@@ -29,10 +29,6 @@ class VIEWS_MUS_EXPORT SurfaceContextFactory : public ui::ContextFactory {
   // ContextFactory:
   void CreateCompositorFrameSink(
       base::WeakPtr<ui::Compositor> compositor) override;
-  std::unique_ptr<ui::Reflector> CreateReflector(
-      ui::Compositor* mirrored_compositor,
-      ui::Layer* mirroring_layer) override;
-  void RemoveReflector(ui::Reflector* reflector) override;
   scoped_refptr<cc::ContextProvider> SharedMainThreadContextProvider() override;
   void RemoveCompositor(ui::Compositor* compositor) override;
   bool DoesCreateTestContexts() override;
@@ -40,24 +36,9 @@ class VIEWS_MUS_EXPORT SurfaceContextFactory : public ui::ContextFactory {
                                  gfx::BufferUsage usage) override;
   gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override;
   cc::TaskGraphRunner* GetTaskGraphRunner() override;
-  cc::FrameSinkId AllocateFrameSinkId() override;
-  cc::SurfaceManager* GetSurfaceManager() override;
-  void SetDisplayVisible(ui::Compositor* compositor, bool visible) override;
-  void ResizeDisplay(ui::Compositor* compositor,
-                     const gfx::Size& size) override;
-  void SetDisplayColorSpace(ui::Compositor* compositor,
-                            const gfx::ColorSpace& color_space) override {}
-  void SetAuthoritativeVSyncInterval(ui::Compositor* compositor,
-                                     base::TimeDelta interval) override {}
-  void SetDisplayVSyncParameters(ui::Compositor* compositor,
-                                 base::TimeTicks timebase,
-                                 base::TimeDelta interval) override {}
-  void SetOutputIsSecure(ui::Compositor* compositor, bool secure) override {}
   void AddObserver(ui::ContextFactoryObserver* observer) override {}
   void RemoveObserver(ui::ContextFactoryObserver* observer) override {}
 
-  cc::SurfaceManager surface_manager_;
-  uint32_t next_sink_id_;
   ui::RasterThreadHelper raster_thread_helper_;
   ui::Gpu* gpu_;