Mandoline UI Process: Update namespaces and file names

components/mus/mus_app.h

Index: components/mus/mus_app.h
diff --git a/components/mus/view_manager_app.h b/components/mus/mus_app.h
similarity index 79%
rename from components/mus/view_manager_app.h
rename to components/mus/mus_app.h
index 80dc19be02b7e8df5c1266f06f09cdaf59d905ab..d7b2b9abf883f91765da06886dfc94307498308e 100644
--- a/components/mus/view_manager_app.h
+++ b/components/mus/mus_app.h
@@ -19,35 +19,30 @@
 #include "mojo/common/tracing_impl.h"
 #include "mojo/common/weak_binding_set.h"
 
-namespace gles2 {
-class GpuState;
-}
-
 namespace mojo {
 class ApplicationImpl;
 }
 
-namespace surfaces {
-class SurfacesScheduler;
-class SurfacesState;
-}
-
 namespace ui {
 class PlatformEventSource;
 }
 
-namespace view_manager {
+namespace mus {
 
 class ConnectionManager;
+class GpuState;
+class SurfacesScheduler;
+class SurfacesState;
 
-class ViewManagerApp : public mojo::ApplicationDelegate,
-                       public ConnectionManagerDelegate,
-                       public mojo::InterfaceFactory<mojo::ViewTreeHostFactory>,
-                       public mojo::InterfaceFactory<mojo::Gpu>,
-                       public mojo::ViewTreeHostFactory {
+class MandolineUIServicesApp
+    : public mojo::ApplicationDelegate,
+      public ConnectionManagerDelegate,
+      public mojo::InterfaceFactory<mojo::ViewTreeHostFactory>,
+      public mojo::InterfaceFactory<mojo::Gpu>,
+      public mojo::ViewTreeHostFactory {
  public:
-  ViewManagerApp();
-  ~ViewManagerApp() override;
+  MandolineUIServicesApp();
+  ~MandolineUIServicesApp() override;
 
  private:
   // ApplicationDelegate:
@@ -60,13 +55,13 @@ class ViewManagerApp : public mojo::ApplicationDelegate,
   ClientConnection* CreateClientConnectionForEmbedAtView(
       ConnectionManager* connection_manager,
       mojo::InterfaceRequest<mojo::ViewTree> tree_request,
-      mojo::ConnectionSpecificId creator_id,
+      ConnectionSpecificId creator_id,
       mojo::URLRequestPtr request,
       const ViewId& root_id) override;
   ClientConnection* CreateClientConnectionForEmbedAtView(
       ConnectionManager* connection_manager,
       mojo::InterfaceRequest<mojo::ViewTree> tree_request,
-      mojo::ConnectionSpecificId creator_id,
+      ConnectionSpecificId creator_id,
       const ViewId& root_id,
       mojo::ViewTreeClientPtr client) override;
 
@@ -88,16 +83,16 @@ class ViewManagerApp : public mojo::ApplicationDelegate,
   mojo::ApplicationImpl* app_impl_;
   scoped_ptr<ConnectionManager> connection_manager_;
   mojo::TracingImpl tracing_;
-  scoped_refptr<gles2::GpuState> gpu_state_;
+  scoped_refptr<GpuState> gpu_state_;
   scoped_ptr<ui::PlatformEventSource> event_source_;
   bool is_headless_;
 
   // Surfaces
-  scoped_refptr<surfaces::SurfacesState> surfaces_state_;
+  scoped_refptr<SurfacesState> surfaces_state_;
 
-  DISALLOW_COPY_AND_ASSIGN(ViewManagerApp);
+  DISALLOW_COPY_AND_ASSIGN(MandolineUIServicesApp);
 };
 
-}  // namespace view_manager
+}  // namespace mus
 
 #endif  // COMPONENTS_MUS_VIEW_MANAGER_APP_H_