Revert of Mandoline UI Process: Update namespaces and file names

components/mus/public/cpp/view_surface.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_MUS_PUBLIC_CPP_VIEW_SURFACE_H_
 #define COMPONENTS_MUS_PUBLIC_CPP_VIEW_SURFACE_H_
 
 #include "base/observer_list.h"
 #include "components/mus/public/interfaces/compositor_frame.mojom.h"
 #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;
 
 // A ViewSurface is wrapper to simplify submitting CompositorFrames to Views,
 // and receiving ReturnedResources.
 class ViewSurface : public mojo::SurfaceClient {
  public:
   ~ViewSurface() override;
 
   // Called to indicate that the current thread has assumed control of this
   // object.
   void BindToThread();
 
   // 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);
 
   // SurfaceClient implementation:
   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_;
   mojo::Binding<mojo::SurfaceClient> client_binding_;
   bool bound_to_thread_;
 };
 
-}  // namespace mus
+}  // namespace mojo
 
 #endif  // COMPONENTS_MUS_PUBLIC_CPP_VIEW_SURFACE_H_