Mandoline UI Process: Update namespaces and file names

components/mus/view_tree_unittest.cc

Index: components/mus/view_tree_unittest.cc
diff --git a/components/mus/view_tree_unittest.cc b/components/mus/view_tree_unittest.cc
index f1f86cd0c94132906c22d4c830c4caffd820b7e0..af03a5200a8e4595908b50c9237cf1bc9c39a82a 100644
--- a/components/mus/view_tree_unittest.cc
+++ b/components/mus/view_tree_unittest.cc
@@ -33,7 +33,7 @@ using mojo::ServiceProviderPtr;
 using mojo::String;
 using mojo::ViewDataPtr;
 
-namespace view_manager {
+namespace mus {
 namespace {
 
 // -----------------------------------------------------------------------------
@@ -52,7 +52,7 @@ class TestViewTreeClient : public mojo::ViewTreeClient {
   void OnEmbed(uint16_t connection_id,
                ViewDataPtr root,
                mojo::ViewTreePtr tree,
-               mojo::Id focused_view_id,
+               Id focused_view_id,
                uint32_t access_policy) override {
     // TODO(sky): add test coverage of |focused_view_id|.
     tracker_.OnEmbed(connection_id, root.Pass());
@@ -148,7 +148,7 @@ class TestConnectionManagerDelegate : public ConnectionManagerDelegate {
   ClientConnection* CreateClientConnectionForEmbedAtView(
       ConnectionManager* connection_manager,
       mojo::InterfaceRequest<mojo::ViewTree> service_request,
-      mojo::ConnectionSpecificId creator_id,
+      ConnectionSpecificId creator_id,
       mojo::URLRequestPtr request,
       const ViewId& root_id) override {
     scoped_ptr<ViewTreeImpl> service(
@@ -159,7 +159,7 @@ class TestConnectionManagerDelegate : public ConnectionManagerDelegate {
   ClientConnection* CreateClientConnectionForEmbedAtView(
       ConnectionManager* connection_manager,
       mojo::InterfaceRequest<mojo::ViewTree> service_request,
-      mojo::ConnectionSpecificId creator_id,
+      ConnectionSpecificId creator_id,
       const ViewId& root_id,
       mojo::ViewTreeClientPtr client) override {
     // Used by ConnectionManager::AddRoot.
@@ -235,8 +235,8 @@ class TestDisplayManagerFactory : public DisplayManagerFactory {
   DisplayManager* CreateDisplayManager(
       bool is_headless,
       mojo::ApplicationImpl* app_impl,
-      const scoped_refptr<gles2::GpuState>& gpu_state,
-      const scoped_refptr<surfaces::SurfacesState>& surfaces_state) override {
+      const scoped_refptr<GpuState>& gpu_state,
+      const scoped_refptr<SurfacesState>& surfaces_state) override {
     return new TestDisplayManager();
   }
 
@@ -300,12 +300,12 @@ class ViewTreeTest : public testing::Test {
   void SetUp() override {
     DisplayManager::set_factory_for_testing(&display_manager_factory_);
     // TODO(fsamuel): This is probably broken. We need a root.
-    connection_manager_.reset(new ConnectionManager(
-        &delegate_, scoped_refptr<surfaces::SurfacesState>()));
+    connection_manager_.reset(
+        new ConnectionManager(&delegate_, scoped_refptr<SurfacesState>()));
     ViewTreeHostImpl* host = new ViewTreeHostImpl(
         mojo::ViewTreeHostClientPtr(), connection_manager_.get(),
-        true /* is_headless */, nullptr, scoped_refptr<gles2::GpuState>(),
-        scoped_refptr<surfaces::SurfacesState>());
+        true /* is_headless */, nullptr, scoped_refptr<GpuState>(),
+        scoped_refptr<SurfacesState>());
     // TODO(fsamuel): This is way too magical. We need to find a better way to
     // manage lifetime.
     host_connection_ = new TestViewTreeHostConnection(
@@ -445,4 +445,4 @@ TEST_F(ViewTreeTest, BasicInputEventTarget) {
             ChangesToDescription1(*embed_connection->tracker()->changes())[1]);
 }
 
-}  // namespace view_manager
+}  // namespace mus