Mandoline UI Process: Update namespaces and file names

components/mus/view_tree_apptest.cc

Index: components/mus/view_tree_apptest.cc
diff --git a/components/mus/view_tree_apptest.cc b/components/mus/view_tree_apptest.cc
index 22b01d78591016cfcc17be1f68076e8cd1c53765..625712ebfba00e409e391d1cf34b06b776c70df3 100644
--- a/components/mus/view_tree_apptest.cc
+++ b/components/mus/view_tree_apptest.cc
@@ -18,11 +18,9 @@ using mojo::ApplicationConnection;
 using mojo::ApplicationDelegate;
 using mojo::Array;
 using mojo::Callback;
-using mojo::ConnectionSpecificId;
 using mojo::ERROR_CODE_NONE;
 using mojo::ErrorCode;
 using mojo::EventPtr;
-using mojo::Id;
 using mojo::InterfaceRequest;
 using mojo::ORDER_DIRECTION_ABOVE;
 using mojo::ORDER_DIRECTION_BELOW;
@@ -36,7 +34,7 @@ using mojo::ViewTree;
 using mojo::ViewTreeClient;
 using mojo::ViewportMetricsPtr;
 
-namespace view_manager {
+namespace mus {
 
 // Creates an id used for transport from the specified parameters.
 Id BuildViewId(ConnectionSpecificId connection_id,
@@ -216,9 +214,8 @@ bool WaitForAllMessages(ViewTree* vm) {
 
 const Id kNullParentId = 0;
 std::string IdToString(Id id) {
-  return (id == kNullParentId)
-             ? "null"
-             : base::StringPrintf("%d,%d", mojo::HiWord(id), mojo::LoWord(id));
+  return (id == kNullParentId) ? "null" : base::StringPrintf(
+                                              "%d,%d", HiWord(id), LoWord(id));
 }
 
 std::string ViewParentToString(Id view, Id parent) {
@@ -304,7 +301,7 @@ class ViewTreeClientImpl : public mojo::ViewTreeClient,
   void OnEmbed(ConnectionSpecificId connection_id,
                ViewDataPtr root,
                mojo::ViewTreePtr tree,
-               mojo::Id focused_view_id,
+               Id focused_view_id,
                uint32_t access_policy) override {
     // TODO(sky): add coverage of |focused_view_id|.
     tree_ = tree.Pass();
@@ -513,7 +510,7 @@ class ViewTreeAppTest : public mojo::test::ApplicationTestBase,
     ApplicationTestBase::SetUp();
     client_factory_.reset(new ViewTreeClientFactory(application_impl()));
     mojo::URLRequestPtr request(mojo::URLRequest::New());
-    request->url = mojo::String::From("mojo:view_manager");
+    request->url = mojo::String::From("mojo:mus");
 
     mojo::ViewTreeHostFactoryPtr factory;
     application_impl()->ConnectToService(request.Pass(), &factory);
@@ -1662,4 +1659,4 @@ TEST_F(ViewTreeAppTest, CantEmbedFromConnectionRoot) {
 // ViewManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window manager
 // tests.
 
-}  // namespace view_manager
+}  // namespace mus