Revert of Mandoline UI Process: Update namespaces and file names

components/mus/public/cpp/view_surface.h

Index: components/mus/public/cpp/view_surface.h
diff --git a/components/mus/public/cpp/view_surface.h b/components/mus/public/cpp/view_surface.h
index 91b0a48210b7bf6f9b18854a1a8d822a05a732bf..f29bb92634946121171990f573a0c3682873c487 100644
--- a/components/mus/public/cpp/view_surface.h
+++ b/components/mus/public/cpp/view_surface.h
@@ -10,7 +10,7 @@
 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr_info.h"
 
-namespace mus {
+namespace mojo {
 
 class ViewSurfaceClient;
 class View;
@@ -28,10 +28,10 @@
   // TODO(fsamuel): Add a callback.
   void SubmitCompositorFrame(mojo::CompositorFramePtr frame);
 
-  void set_client(ViewSurfaceClient* client) { client_ = client; }
+  void set_client(mojo::ViewSurfaceClient* client) { client_ = client; }
 
  private:
-  friend class View;
+  friend class mojo::View;
 
   ViewSurface(mojo::InterfacePtrInfo<mojo::Surface> surface_info,
               mojo::InterfaceRequest<mojo::SurfaceClient> client_request);
@@ -40,7 +40,7 @@
   void ReturnResources(
       mojo::Array<mojo::ReturnedResourcePtr> resources) override;
 
-  ViewSurfaceClient* client_;
+  mojo::ViewSurfaceClient* client_;
   mojo::InterfacePtrInfo<mojo::Surface> surface_info_;
   mojo::InterfaceRequest<mojo::SurfaceClient> client_request_;
   mojo::SurfacePtr surface_;
@@ -48,6 +48,6 @@
   bool bound_to_thread_;
 };
 
-}  // namespace mus
+}  // namespace mojo
 
 #endif  // COMPONENTS_MUS_PUBLIC_CPP_VIEW_SURFACE_H_