Revert of Mandoline UI Process: Update namespaces and file names

mojo/cc/output_surface_mojo.h

Index: mojo/cc/output_surface_mojo.h
diff --git a/mojo/cc/output_surface_mojo.h b/mojo/cc/output_surface_mojo.h
index 644a5dcd1b6d69b396cd3adef5a7266c7189a7ef..135e2afb26d3c37d9b2a99cd7952966705186fb1 100644
--- a/mojo/cc/output_surface_mojo.h
+++ b/mojo/cc/output_surface_mojo.h
@@ -15,10 +15,10 @@
 namespace mojo {
 
 class OutputSurfaceMojo : public cc::OutputSurface,
-                          public mus::ViewSurfaceClient {
+                          public mojo::ViewSurfaceClient {
  public:
   OutputSurfaceMojo(const scoped_refptr<cc::ContextProvider>& context_provider,
-                    scoped_ptr<mus::ViewSurface> surface);
+                    scoped_ptr<mojo::ViewSurface> surface);
   ~OutputSurfaceMojo() override;
 
   // cc::OutputSurface implementation.
@@ -26,12 +26,12 @@
   bool BindToClient(cc::OutputSurfaceClient* client) override;
 
  private:
-  // ViewSurfaceClient implementation:
+  // uip::SurfaceObserver implementation:
   void OnResourcesReturned(
-      mus::ViewSurface* surface,
+      mojo::ViewSurface* surface,
       mojo::Array<mojo::ReturnedResourcePtr> resources) override;
 
-  scoped_ptr<mus::ViewSurface> surface_;
+  scoped_ptr<mojo::ViewSurface> surface_;
 
   DISALLOW_COPY_AND_ASSIGN(OutputSurfaceMojo);
 };