Rename ViewManagerService,ViewManagerClient -> ViewTree,ViewTreeClient

components/html_viewer/html_frame_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/auto_reset.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
@@ skipping 88 matching lines @@
     base::AutoReset<bool> resetter(&waiting_for_navigate_, true);
     return ViewManagerTestBase::DoRunLoopWithTimeout() && got_navigate_;
   }
 
   // TestFrameTreeDelegate:
   bool CanNavigateFrame(
       Frame* target,
       mojo::URLRequestPtr request,
       mandoline::FrameTreeClient** frame_tree_client,
       scoped_ptr<mandoline::FrameUserData>* frame_user_data,
-      mojo::ViewManagerClientPtr* view_manager_client) override {
+      mojo::ViewTreeClientPtr* tree_client) override {
     scoped_ptr<FrameConnection> frame_connection(new FrameConnection);
-    frame_connection->Init(app_, request.Pass(), view_manager_client);
+    frame_connection->Init(app_, request.Pass(), tree_client);
     *frame_tree_client = frame_connection->frame_tree_client();
     *frame_user_data = frame_connection.Pass();
 
     return true;
   }
 
   void DidStartNavigation(Frame* frame) override {
     got_navigate_ = true;
 
     if (waiting_for_navigate_)
@@ skipping 67 matching lines @@
     mojo::URLRequestPtr request(mojo::URLRequest::New());
     request->url = mojo::String::From(AddPortToString(url_string));
     return request.Pass();
   }
 
   FrameConnection* InitFrameTree(View* view, const std::string& url_string) {
     frame_tree_delegate_.reset(
         new TestFrameTreeDelegateImpl(application_impl()));
     scoped_ptr<FrameConnection> frame_connection(new FrameConnection);
     FrameConnection* result = frame_connection.get();
-    ViewManagerClientPtr view_manager_client;
+    ViewTreeClientPtr tree_client;
     frame_connection->Init(application_impl(), BuildRequestForURL(url_string),
-                           &view_manager_client);
+                           &tree_client);
     FrameTreeClient* frame_tree_client = frame_connection->frame_tree_client();
     frame_tree_.reset(new FrameTree(view, frame_tree_delegate_.get(),
                                     frame_tree_client,
                                     frame_connection.Pass(),
                                     Frame::ClientPropertyMap()));
     frame_tree_delegate_->set_frame_tree(frame_tree_.get());
-    view->Embed(view_manager_client.Pass());
+    view->Embed(tree_client.Pass());
     return result;
   }
 
   bool WaitForNavigateFrame() {
     if (frame_tree_delegate_->waiting_for_navigate())
       return false;
 
     frame_tree_delegate_->clear_got_navigate();
     return frame_tree_delegate_->WaitForNavigateFrame();
   }
@@ skipping 244 matching lines @@
         script_value_as_list->GetString(0u, &message_in_child);
       }
     }
   } while (message_in_child != "hello from parent" &&
            base::TimeTicks::Now() - start_time <
                TestTimeouts::action_timeout());
   EXPECT_EQ("hello from parent", message_in_child);
 }
 
 }  // namespace mojo