Revert of Mandoline UI Process: Update namespaces and file names

mojo/cc/output_surface_mojo.cc

Index: mojo/cc/output_surface_mojo.cc
diff --git a/mojo/cc/output_surface_mojo.cc b/mojo/cc/output_surface_mojo.cc
index 68803baebb6ecc34329ec2abc84285a9dc2544d0..236bd1d6a23cc02e1558f5ab53604250fa1254ca 100644
--- a/mojo/cc/output_surface_mojo.cc
+++ b/mojo/cc/output_surface_mojo.cc
@@ -15,8 +15,9 @@
 
 OutputSurfaceMojo::OutputSurfaceMojo(
     const scoped_refptr<cc::ContextProvider>& context_provider,
-    scoped_ptr<mus::ViewSurface> surface)
-    : cc::OutputSurface(context_provider), surface_(surface.Pass()) {
+    scoped_ptr<mojo::ViewSurface> surface)
+    : cc::OutputSurface(context_provider),
+      surface_(surface.Pass()) {
   capabilities_.delegated_rendering = true;
   capabilities_.max_frames_pending = 1;
 }
@@ -39,7 +40,7 @@
 }
 
 void OutputSurfaceMojo::OnResourcesReturned(
-    mus::ViewSurface* surface,
+    mojo::ViewSurface* surface,
     mojo::Array<mojo::ReturnedResourcePtr> resources) {
   cc::CompositorFrameAck cfa;
   cfa.resources = resources.To<cc::ReturnedResourceArray>();