Rename ViewManagerService,ViewManagerClient -> ViewTree,ViewTreeClient

components/html_viewer/ax_provider_apptest.cc

 // Copyright 2015 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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/test_timeouts.h"
 #include "components/view_manager/public/cpp/tests/view_manager_test_base.h"
@@ skipping 61 matching lines @@
 
   // Connect to the URL through the mojo:html_viewer content handler.
   const uint16_t assigned_port = server.host_port_pair().port();
   mojo::URLRequestPtr request(mojo::URLRequest::New());
   request->url = mojo::String::From(
       base::StringPrintf("http://127.0.0.1:%u/files/test.html", assigned_port));
   scoped_ptr<ApplicationConnection> connection =
       application_impl()->ConnectToApplication(request.Pass());
 
   // Embed the html_viewer in a View.
-  ViewManagerClientPtr view_manager_client;
-  connection->ConnectToService(&view_manager_client);
+  ViewTreeClientPtr tree_client;
+  connection->ConnectToService(&tree_client);
   View* embed_view = window_manager()->CreateView();
-  embed_view->Embed(view_manager_client.Pass());
+  embed_view->Embed(tree_client.Pass());
 
   TestFrameTreeServer frame_tree_server;
   mandoline::FrameTreeServerPtr frame_tree_server_ptr;
   mojo::Binding<mandoline::FrameTreeServer> frame_tree_server_binding(
       &frame_tree_server);
   frame_tree_server_binding.Bind(GetProxy(&frame_tree_server_ptr).Pass());
 
   mojo::Array<mandoline::FrameDataPtr> array(1u);
   array[0] = mandoline::FrameData::New().Pass();
   array[0]->frame_id = embed_view->id();
@@ skipping 13 matching lines @@
                          EXPECT_TRUE(QuitRunLoop());
                        });
   ASSERT_TRUE(DoRunLoopWithTimeout());
 
   EXPECT_TRUE(AxTreeContainsText(ax_tree, "Hello "));
   EXPECT_TRUE(AxTreeContainsText(ax_tree, "World!"));
   EXPECT_FALSE(AxTreeContainsText(ax_tree, "foo"));
 }
 
 }  // namespace mojo