Rename ViewManagerService,ViewManagerClient -> ViewTree,ViewTreeClient

components/view_manager/view_manager_client_apptest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/view_manager/public/cpp/view_manager.h"
 
 #include "base/logging.h"
-#include "components/view_manager/public/cpp/lib/view_manager_client_impl.h"
 #include "components/view_manager/public/cpp/tests/view_manager_test_base.h"
 #include "components/view_manager/public/cpp/view_manager_delegate.h"
 #include "components/view_manager/public/cpp/view_manager_init.h"
 #include "components/view_manager/public/cpp/view_observer.h"
 #include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/application/public/cpp/application_test_base.h"
 #include "ui/mojo/geometry/geometry_util.h"
 
 namespace mojo {
@@ skipping 154 matching lines @@
   ViewManager* Embed(View* view) {
     return EmbedImpl(view, EmbedType::NO_REEMBED);
   }
 
   // Same as Embed(), but uses EmbedAllowingReembed().
   ViewManager* EmbedAllowingReembed(View* view) {
     return EmbedImpl(view, EmbedType::ALLOW_REEMBED);
   }
 
   // Establishes a connection to this application and asks for a
-  // ViewManagerClient. The ViewManagerClient is then embedded in |view|.
-  // This does *not* wait for the connection to complete.
+  // ViewTreeClient. The ViewTreeClient is then embedded in |view|. This does
+  // *not* wait for the connection to complete.
   void ConnectToApplicationAndEmbed(View* view) {
     mojo::URLRequestPtr request(mojo::URLRequest::New());
     request->url = mojo::String::From(application_impl()->url());
     scoped_ptr<ApplicationConnection> connection =
         application_impl()->ConnectToApplication(request.Pass());
-    mojo::ViewManagerClientPtr client;
+    mojo::ViewTreeClientPtr client;
     connection->ConnectToService(&client);
     view->Embed(client.Pass());
   }
 
   // Overridden from ViewManagerDelegate:
   void OnEmbedForDescendant(View* view,
                             mojo::URLRequestPtr request,
-                            mojo::ViewManagerClientPtr* client) override {
+                            mojo::ViewTreeClientPtr* client) override {
     on_will_embed_count_++;
     if (on_will_embed_return_value_) {
       scoped_ptr<ApplicationConnection> connection =
           application_impl()->ConnectToApplication(request.Pass());
       connection->ConnectToService(client);
     } else {
       EXPECT_TRUE(QuitRunLoop());
     }
   }
 
@@ skipping 640 matching lines @@
   // As |vm2| is an embed root it should get notified about |vm3_v1|.
   ASSERT_TRUE(WaitForTreeSizeToMatch(vm2_v1, 2));
 
   // Embed() from vm2 in vm3_v1. This is allowed as vm2 is an embed root.
   ASSERT_EQ(1u, vm2_v1->children().size());
   View* vm3_v1_in_vm2 = vm2_v1->children()[0];
   ASSERT_TRUE(Embed(vm3_v1_in_vm2));
 }
 
 }  // namespace mojo