Revert of Mandoline UI Process: Update namespaces and file names

components/mus/connection_manager.h

Index: components/mus/connection_manager.h
diff --git a/components/mus/connection_manager.h b/components/mus/connection_manager.h
index 673ec122a7640b523f09becd36bcfad2e8f4d7d5..3aadfc17b030e9d61dd1424b2ce63106b3777509 100644
--- a/components/mus/connection_manager.h
+++ b/components/mus/connection_manager.h
@@ -23,7 +23,7 @@
 #include "third_party/mojo/src/mojo/public/cpp/bindings/array.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
 
-namespace mus {
+namespace view_manager {
 
 class ClientConnection;
 class ConnectionManagerDelegate;
@@ -46,32 +46,33 @@
                  bool is_delete_view);
     ~ScopedChange();
 
-    ConnectionSpecificId connection_id() const { return connection_id_; }
+    mojo::ConnectionSpecificId connection_id() const { return connection_id_; }
     bool is_delete_view() const { return is_delete_view_; }
 
     // Marks the connection with the specified id as having seen a message.
-    void MarkConnectionAsMessaged(ConnectionSpecificId connection_id) {
+    void MarkConnectionAsMessaged(mojo::ConnectionSpecificId connection_id) {
       message_ids_.insert(connection_id);
     }
 
     // Returns true if MarkConnectionAsMessaged(connection_id) was invoked.
-    bool DidMessageConnection(ConnectionSpecificId connection_id) const {
+    bool DidMessageConnection(mojo::ConnectionSpecificId connection_id) const {
       return message_ids_.count(connection_id) > 0;
     }
 
    private:
     ConnectionManager* connection_manager_;
-    const ConnectionSpecificId connection_id_;
+    const mojo::ConnectionSpecificId connection_id_;
     const bool is_delete_view_;
 
     // See description of MarkConnectionAsMessaged/DidMessageConnection.
-    std::set<ConnectionSpecificId> message_ids_;
+    std::set<mojo::ConnectionSpecificId> message_ids_;
 
     DISALLOW_COPY_AND_ASSIGN(ScopedChange);
   };
 
-  ConnectionManager(ConnectionManagerDelegate* delegate,
-                    const scoped_refptr<SurfacesState>& surfaces_state);
+  ConnectionManager(
+      ConnectionManagerDelegate* delegate,
+      const scoped_refptr<surfaces::SurfacesState>& surfaces_state);
   ~ConnectionManager() override;
 
   // Adds a ViewTreeHost.
@@ -82,7 +83,7 @@
   ServerView* CreateServerView(const ViewId& id);
 
   // Returns the id for the next ViewTreeImpl.
-  ConnectionSpecificId GetAndAdvanceNextConnectionId();
+  mojo::ConnectionSpecificId GetAndAdvanceNextConnectionId();
 
   // Returns the id for the next ViewTreeHostImpl.
   uint16_t GetAndAdvanceNextHostId();
@@ -96,17 +97,17 @@
 
   // See description of ViewTree::Embed() for details. This assumes
   // |transport_view_id| is valid.
-  void EmbedAtView(ConnectionSpecificId creator_id,
+  void EmbedAtView(mojo::ConnectionSpecificId creator_id,
                    const ViewId& view_id,
                    uint32_t policy_bitmask,
                    mojo::URLRequestPtr request);
-  ViewTreeImpl* EmbedAtView(ConnectionSpecificId creator_id,
+  ViewTreeImpl* EmbedAtView(mojo::ConnectionSpecificId creator_id,
                             const ViewId& view_id,
                             uint32_t policy_bitmask,
                             mojo::ViewTreeClientPtr client);
 
   // Returns the connection by id.
-  ViewTreeImpl* GetConnection(ConnectionSpecificId connection_id);
+  ViewTreeImpl* GetConnection(mojo::ConnectionSpecificId connection_id);
 
   // Returns the View identified by |id|.
   ServerView* GetView(const ViewId& id);
@@ -129,10 +130,10 @@
 
   // Invoked when a connection messages a client about the change. This is used
   // to avoid sending ServerChangeIdAdvanced() unnecessarily.
-  void OnConnectionMessagedClient(ConnectionSpecificId id);
+  void OnConnectionMessagedClient(mojo::ConnectionSpecificId id);
 
   // Returns true if OnConnectionMessagedClient() was invoked for id.
-  bool DidConnectionMessageClient(ConnectionSpecificId id) const;
+  bool DidConnectionMessageClient(mojo::ConnectionSpecificId id) const;
 
   // Returns the metrics of the viewport where the provided |view| is displayed.
   mojo::ViewportMetricsPtr GetViewportMetricsForView(const ServerView* view);
@@ -176,7 +177,7 @@
   void ProcessViewDeleted(const ViewId& view);
 
  private:
-  using ConnectionMap = std::map<ConnectionSpecificId, ClientConnection*>;
+  using ConnectionMap = std::map<mojo::ConnectionSpecificId, ClientConnection*>;
   using HostConnectionMap =
       std::map<ViewTreeHostImpl*, ViewTreeHostConnection*>;
 
@@ -192,7 +193,7 @@
   void FinishChange();
 
   // Returns true if the specified connection originated the current change.
-  bool IsChangeSource(ConnectionSpecificId connection_id) const {
+  bool IsChangeSource(mojo::ConnectionSpecificId connection_id) const {
     return current_change_ && current_change_->connection_id() == connection_id;
   }
 
@@ -202,7 +203,7 @@
   // Overridden from ServerViewDelegate:
   scoped_ptr<cc::CompositorFrame> UpdateViewTreeFromCompositorFrame(
       const mojo::CompositorFramePtr& input) override;
-  SurfacesState* GetSurfacesState() override;
+  surfaces::SurfacesState* GetSurfacesState() override;
   void OnScheduleViewPaint(const ServerView* view) override;
   const ServerView* GetRootView(const ServerView* view) const override;
 
@@ -237,10 +238,10 @@
   ConnectionManagerDelegate* delegate_;
 
   // State for rendering into a Surface.
-  scoped_refptr<SurfacesState> surfaces_state_;
+  scoped_refptr<surfaces::SurfacesState> surfaces_state_;
 
   // ID to use for next ViewTreeImpl.
-  ConnectionSpecificId next_connection_id_;
+  mojo::ConnectionSpecificId next_connection_id_;
 
   // ID to use for next ViewTreeHostImpl.
   uint16_t next_host_id_;
@@ -260,6 +261,6 @@
   DISALLOW_COPY_AND_ASSIGN(ConnectionManager);
 };
 
-}  // namespace mus
+}  // namespace view_manager
 
 #endif  // COMPONENTS_MUS_CONNECTION_MANAGER_H_