Enabling Aura-Mus clients to submit frames to Mus.

ui/aura/mus/window_compositor_frame_sink.h

Index: ui/aura/mus/window_compositor_frame_sink.h
diff --git a/services/ui/public/cpp/window_compositor_frame_sink.h b/ui/aura/mus/window_compositor_frame_sink.h
similarity index 91%
copy from services/ui/public/cpp/window_compositor_frame_sink.h
copy to ui/aura/mus/window_compositor_frame_sink.h
index 2bb98687125879acab6f7bc721457e96b6af9651..b63fab0175894c9b038f5da2109d8ce687a6a48b 100644
--- a/services/ui/public/cpp/window_compositor_frame_sink.h
+++ b/ui/aura/mus/window_compositor_frame_sink.h
@@ -2,13 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_UI_PUBLIC_CPP_WINDOW_COMPOSITOR_FRAME_SINK_H_
-#define SERVICES_UI_PUBLIC_CPP_WINDOW_COMPOSITOR_FRAME_SINK_H_
+#ifndef UI_AURA_MUS_WINDOW_COMPOSITOR_FRAME_SINK_H_
+#define UI_AURA_MUS_WINDOW_COMPOSITOR_FRAME_SINK_H_
 
 #include "base/macros.h"
 #include "cc/ipc/mojo_compositor_frame_sink.mojom.h"
 #include "cc/output/compositor_frame_sink.h"
-#include "cc/output/context_provider.h"
 #include "cc/scheduler/begin_frame_source.h"
 #include "cc/surfaces/surface_id.h"
 #include "mojo/public/cpp/bindings/binding.h"
@@ -17,7 +16,7 @@ namespace gpu {
 class GpuChannelHost;
 }
 
-namespace ui {
+namespace aura {
 
 class WindowCompositorFrameSinkBinding;
 
@@ -40,8 +39,6 @@ class WindowCompositorFrameSink
   void SubmitCompositorFrame(cc::CompositorFrame frame) override;
 
  private:
-  friend class Window;
-
   WindowCompositorFrameSink(
       scoped_refptr<cc::ContextProvider> context_provider,
       gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
@@ -77,7 +74,7 @@ class WindowCompositorFrameSinkBinding {
   ~WindowCompositorFrameSinkBinding();
 
  private:
-  friend class Window;
+  friend class WindowPortMus;
   friend class WindowCompositorFrameSink;
 
   WindowCompositorFrameSinkBinding(
@@ -91,6 +88,7 @@ class WindowCompositorFrameSinkBinding {
 
   DISALLOW_COPY_AND_ASSIGN(WindowCompositorFrameSinkBinding);
 };
-}  // namespace ui
 
-#endif  // SERVICES_UI_PUBLIC_CPP_WINDOW_COMPOSITOR_FRAME_SINK_H_
+}  // namespace aura
+
+#endif  // UI_AURA_MUS_WINDOW_COMPOSITOR_FRAME_SINK_H_