1 files changed, 12 insertions, 9 deletions
diff --git a/components/mus/connection_manager.cc b/components/mus/connection_manager.cc
index 8186ac2..0bd6602 100644
--- a/components/mus/connection_manager.cc
+++ b/components/mus/connection_manager.cc
@@ -20,7 +20,9 @@
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
 #include "ui/gfx/geometry/size_conversions.h"
 
-namespace mus {
+using mojo::ConnectionSpecificId;
+
+namespace view_manager {
 
 ConnectionManager::ScopedChange::ScopedChange(
     ViewTreeImpl* connection,
@@ -38,7 +40,7 @@ ConnectionManager::ScopedChange::~ScopedChange() {
 
 ConnectionManager::ConnectionManager(
     ConnectionManagerDelegate* delegate,
-    const scoped_refptr<SurfacesState>& surfaces_state)
+    const scoped_refptr<surfaces::SurfacesState>& surfaces_state)
     : delegate_(delegate),
       surfaces_state_(surfaces_state),
       next_connection_id_(1),
@@ -127,7 +129,7 @@ void ConnectionManager::OnHostConnectionClosed(
     delegate_->OnNoMoreRootConnections();
 }
 
-void ConnectionManager::EmbedAtView(ConnectionSpecificId creator_id,
+void ConnectionManager::EmbedAtView(mojo::ConnectionSpecificId creator_id,
                                     const ViewId& view_id,
                                     uint32_t policy_bitmask,
                                     mojo::URLRequestPtr request) {
@@ -142,10 +144,11 @@ void ConnectionManager::EmbedAtView(ConnectionSpecificId creator_id,
   OnConnectionMessagedClient(client_connection->service()->id());
 }
 
-ViewTreeImpl* ConnectionManager::EmbedAtView(ConnectionSpecificId creator_id,
-                                             const ViewId& view_id,
-                                             uint32_t policy_bitmask,
-                                             mojo::ViewTreeClientPtr client) {
+ViewTreeImpl* ConnectionManager::EmbedAtView(
+    mojo::ConnectionSpecificId creator_id,
+    const ViewId& view_id,
+    uint32_t policy_bitmask,
+    mojo::ViewTreeClientPtr client) {
   mojo::ViewTreePtr service_ptr;
   ClientConnection* client_connection =
       delegate_->CreateClientConnectionForEmbedAtView(
@@ -332,7 +335,7 @@ ConnectionManager::UpdateViewTreeFromCompositorFrame(
   return ConvertToCompositorFrame(input, this);
 }
 
-SurfacesState* ConnectionManager::GetSurfacesState() {
+surfaces::SurfacesState* ConnectionManager::GetSurfacesState() {
   return surfaces_state_.get();
 }
 
@@ -461,4 +464,4 @@ bool ConnectionManager::ConvertSurfaceDrawQuad(
   return true;
 }
 
-}  // namespace mus
+}  // namespace view_manager