Revert of Mandoline UI Process: Update namespaces and file names

mandoline/ui/aura/surface_context_factory.h

Index: mandoline/ui/aura/surface_context_factory.h
diff --git a/mandoline/ui/aura/surface_context_factory.h b/mandoline/ui/aura/surface_context_factory.h
index dd859eba001fa1ab2c7402d00b9934186622a2e3..92d4d253072af4199e6f98946d1fbd1f690c6613 100644
--- a/mandoline/ui/aura/surface_context_factory.h
+++ b/mandoline/ui/aura/surface_context_factory.h
@@ -12,9 +12,6 @@
 
 namespace mojo {
 class Shell;
-}
-
-namespace mus {
 class View;
 }
 
@@ -22,7 +19,7 @@
 
 class SurfaceContextFactory : public ui::ContextFactory {
  public:
-  SurfaceContextFactory(mojo::Shell* shell, mus::View* view);
+  SurfaceContextFactory(mojo::Shell* shell, mojo::View* view);
   ~SurfaceContextFactory() override;
 
  private:
@@ -47,7 +44,7 @@
   SurfaceBinding surface_binding_;
   uint32_t next_surface_id_namespace_;
   gles2::RasterThreadHelper raster_thread_helper_;
-  mus::MojoGpuMemoryBufferManager gpu_memory_buffer_manager_;
+  gles2::MojoGpuMemoryBufferManager gpu_memory_buffer_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfaceContextFactory);
 };