| Index: components/mus/ids.h
 | 
| diff --git a/components/mus/ids.h b/components/mus/ids.h
 | 
| index aac77129f068f987f43cccaf83eaff8e2918026a..7099a58fba56d4d2328ce6aa97fb086ce035766a 100644
 | 
| --- a/components/mus/ids.h
 | 
| +++ b/components/mus/ids.h
 | 
| @@ -8,16 +8,15 @@
 | 
|  #include "components/mus/public/cpp/types.h"
 | 
|  #include "components/mus/public/cpp/util.h"
 | 
|  
 | 
| -namespace view_manager {
 | 
| +namespace mus {
 | 
|  
 | 
|  // Connection id is used to indicate no connection. That is, no ViewTreeImpl
 | 
|  // ever gets this id.
 | 
| -const mojo::ConnectionSpecificId kInvalidConnectionId = 0;
 | 
| +const ConnectionSpecificId kInvalidConnectionId = 0;
 | 
|  
 | 
|  // Adds a bit of type safety to view ids.
 | 
|  struct ViewId {
 | 
| -  ViewId(mojo::ConnectionSpecificId connection_id,
 | 
| -         mojo::ConnectionSpecificId view_id)
 | 
| +  ViewId(ConnectionSpecificId connection_id, ConnectionSpecificId view_id)
 | 
|        : connection_id(connection_id), view_id(view_id) {}
 | 
|    ViewId() : connection_id(0), view_id(0) {}
 | 
|  
 | 
| @@ -27,15 +26,15 @@ struct ViewId {
 | 
|  
 | 
|    bool operator!=(const ViewId& other) const { return !(*this == other); }
 | 
|  
 | 
| -  mojo::ConnectionSpecificId connection_id;
 | 
| -  mojo::ConnectionSpecificId view_id;
 | 
| +  ConnectionSpecificId connection_id;
 | 
| +  ConnectionSpecificId view_id;
 | 
|  };
 | 
|  
 | 
| -inline ViewId ViewIdFromTransportId(mojo::Id id) {
 | 
| -  return ViewId(mojo::HiWord(id), mojo::LoWord(id));
 | 
| +inline ViewId ViewIdFromTransportId(Id id) {
 | 
| +  return ViewId(HiWord(id), LoWord(id));
 | 
|  }
 | 
|  
 | 
| -inline mojo::Id ViewIdToTransportId(const ViewId& id) {
 | 
| +inline Id ViewIdToTransportId(const ViewId& id) {
 | 
|    return (id.connection_id << 16) | id.view_id;
 | 
|  }
 | 
|  
 | 
| @@ -50,6 +49,6 @@ inline ViewId RootViewId(uint16_t index) {
 | 
|    return ViewId(kInvalidConnectionId, 2 + index);
 | 
|  }
 | 
|  
 | 
| -}  // namespace view_manager
 | 
| +}  // namespace mus
 | 
|  
 | 
|  #endif  // COMPONENTS_MUS_IDS_H_
 | 
| 
 |