Revert of Mandoline UI Process: Update namespaces and file names

mandoline/ui/aura/surface_binding.cc

Index: mandoline/ui/aura/surface_binding.cc
diff --git a/mandoline/ui/aura/surface_binding.cc b/mandoline/ui/aura/surface_binding.cc
index 80483737c5d3b588bb3d4942c56ae48e96f69bee..df2299ea65c9bf2ad2c95bc11dfc82d039d76c5c 100644
--- a/mandoline/ui/aura/surface_binding.cc
+++ b/mandoline/ui/aura/surface_binding.cc
@@ -42,17 +42,17 @@
     : public base::RefCounted<PerConnectionState> {
  public:
   static PerConnectionState* Get(mojo::Shell* shell,
-                                 mus::ViewTreeConnection* connection);
+                                 mojo::ViewTreeConnection* connection);
 
-  scoped_ptr<cc::OutputSurface> CreateOutputSurface(mus::View* view);
+  scoped_ptr<cc::OutputSurface> CreateOutputSurface(mojo::View* view);
 
  private:
-  typedef std::map<mus::ViewTreeConnection*, PerConnectionState*>
-      ConnectionToStateMap;
+  typedef std::map<mojo::ViewTreeConnection*,
+                   PerConnectionState*> ConnectionToStateMap;
 
   friend class base::RefCounted<PerConnectionState>;
 
-  PerConnectionState(mojo::Shell* shell, mus::ViewTreeConnection* connection);
+  PerConnectionState(mojo::Shell* shell, mojo::ViewTreeConnection* connection);
   ~PerConnectionState();
 
   void Init();
@@ -61,7 +61,7 @@
       base::ThreadLocalPointer<ConnectionToStateMap>>::Leaky view_states;
 
   mojo::Shell* shell_;
-  mus::ViewTreeConnection* connection_;
+  mojo::ViewTreeConnection* connection_;
 
   // Set of state needed to create an OutputSurface.
   mojo::GpuPtr gpu_;
@@ -77,7 +77,7 @@
 // static
 SurfaceBinding::PerConnectionState* SurfaceBinding::PerConnectionState::Get(
     mojo::Shell* shell,
-    mus::ViewTreeConnection* connection) {
+    mojo::ViewTreeConnection* connection) {
   ConnectionToStateMap* view_map = view_states.Pointer()->Get();
   if (!view_map) {
     view_map = new ConnectionToStateMap;
@@ -91,7 +91,7 @@
 }
 
 scoped_ptr<cc::OutputSurface>
-SurfaceBinding::PerConnectionState::CreateOutputSurface(mus::View* view) {
+SurfaceBinding::PerConnectionState::CreateOutputSurface(mojo::View* view) {
   // TODO(sky): figure out lifetime here. Do I need to worry about the return
   // value outliving this?
   mojo::CommandBufferPtr cb;
@@ -105,8 +105,9 @@
 
 SurfaceBinding::PerConnectionState::PerConnectionState(
     mojo::Shell* shell,
-    mus::ViewTreeConnection* connection)
-    : shell_(shell) {}
+    mojo::ViewTreeConnection* connection)
+    : shell_(shell) {
+}
 
 SurfaceBinding::PerConnectionState::~PerConnectionState() {
   ConnectionToStateMap* view_map = view_states.Pointer()->Get();
@@ -131,8 +132,10 @@
 
 // SurfaceBinding --------------------------------------------------------------
 
-SurfaceBinding::SurfaceBinding(mojo::Shell* shell, mus::View* view)
-    : view_(view), state_(PerConnectionState::Get(shell, view->connection())) {}
+SurfaceBinding::SurfaceBinding(mojo::Shell* shell, mojo::View* view)
+    : view_(view),
+      state_(PerConnectionState::Get(shell, view->connection())) {
+}
 
 SurfaceBinding::~SurfaceBinding() {
 }