Revert of Implement aura::WindowPortMus::CreateCompositorFrameSink()

ui/aura/mus/window_port_mus.h

Index: ui/aura/mus/window_port_mus.h
diff --git a/ui/aura/mus/window_port_mus.h b/ui/aura/mus/window_port_mus.h
index aa18c57c3cdbdf36cfc716abc7b7a7fbf007eea8..c72fb583bbbfcf55022721399d6c0daec7b6d481 100644
--- a/ui/aura/mus/window_port_mus.h
+++ b/ui/aura/mus/window_port_mus.h
@@ -24,10 +24,6 @@
 #include "ui/gfx/geometry/rect.h"
 #include "ui/platform_window/mojo/text_input_state.mojom.h"
 
-namespace viz {
-class ClientCompositorFrameSink;
-}
-
 namespace aura {
 
 class ClientSurfaceEmbedder;
@@ -80,7 +76,7 @@
              uint32_t flags,
              const ui::mojom::WindowTree::EmbedCallback& callback);
 
-  std::unique_ptr<viz::ClientCompositorFrameSink> RequestCompositorFrameSink(
+  std::unique_ptr<cc::CompositorFrameSink> RequestCompositorFrameSink(
       scoped_refptr<cc::ContextProvider> context_provider,
       gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager);
 
@@ -227,6 +223,7 @@
   void SetFrameSinkIdFromServer(const cc::FrameSinkId& frame_sink_id) override;
   const cc::LocalSurfaceId& GetOrAllocateLocalSurfaceId(
       const gfx::Size& surface_size_in_pixels) override;
+  void SetPrimarySurfaceInfo(const cc::SurfaceInfo& surface_info) override;
   void SetFallbackSurfaceInfo(const cc::SurfaceInfo& surface_info) override;
   void DestroyFromServer() override;
   void AddTransientChildFromServer(WindowMus* child) override;
@@ -242,7 +239,6 @@
   void PrepareForTransientRestack(WindowMus* window) override;
   void OnTransientRestackDone(WindowMus* window) override;
   void NotifyEmbeddedAppDisconnected() override;
-  bool HasLocalCompositorFrameSink() override;
 
   // WindowPort:
   void OnPreInit(Window* window) override;
@@ -289,11 +285,6 @@
 
   ui::CursorData cursor_;
 
-  // When a frame sink is created
-  // for a local aura::Window, we need keep a weak ptr of it, so we can update
-  // the local surface id when necessary.
-  base::WeakPtr<viz::ClientCompositorFrameSink> local_compositor_frame_sink_;
-
   DISALLOW_COPY_AND_ASSIGN(WindowPortMus);
 };