Rename ViewManagerService,ViewManagerClient -> ViewTree,ViewTreeClient

mandoline/tab/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 "mandoline/tab/frame.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/test/test_timeouts.h"
-#include "components/view_manager/public/cpp/lib/view_manager_client_impl.h"
+#include "components/view_manager/public/cpp/view_manager.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 "mandoline/tab/frame.h"
 #include "mandoline/tab/frame_tree.h"
 #include "mandoline/tab/frame_tree_delegate.h"
 #include "mandoline/tab/frame_user_data.h"
 #include "mandoline/tab/test_frame_tree_delegate.h"
 #include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/application/public/cpp/application_delegate.h"
@@ skipping 35 matching lines @@
 void QuitRunLoop() {
   current_run_loop->Quit();
   current_run_loop = nullptr;
 }
 
 }  // namespace
 
 class FrameTest : public mojo::test::ApplicationTestBase,
                   public mojo::ApplicationDelegate,
                   public mojo::ViewManagerDelegate,
-                  public mojo::InterfaceFactory<mojo::ViewManagerClient> {
+                  public mojo::InterfaceFactory<mojo::ViewTreeClient> {
  public:
-  FrameTest() : most_recent_view_manager_(nullptr), window_manager_(nullptr) {}
+  FrameTest() : most_recent_view_tree_(nullptr), window_manager_(nullptr) {}
 
-  ViewManager* most_recent_view_manager() { return most_recent_view_manager_; }
+  ViewManager* most_recent_view_tree() { return most_recent_view_tree_; }
 
   // ApplicationDelegate implementation.
   bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) override {
-    connection->AddService<mojo::ViewManagerClient>(this);
+    connection->AddService<mojo::ViewTreeClient>(this);
     return true;
   }
 
   ViewManager* window_manager() { return window_manager_; }
 
   // ApplicationTestBase:
   ApplicationDelegate* GetApplicationDelegate() override { return this; }
 
   // Overridden from ViewManagerDelegate:
   void OnEmbed(View* root) override {
-    most_recent_view_manager_ = root->view_manager();
+    most_recent_view_tree_ = root->view_manager();
     QuitRunLoop();
   }
   void OnViewManagerDestroyed(ViewManager* view_manager) override {}
 
  private:
   // Overridden from testing::Test:
   void SetUp() override {
     ApplicationTestBase::SetUp();
 
     view_manager_init_.reset(
         new mojo::ViewManagerInit(application_impl(), this, nullptr));
     ASSERT_TRUE(DoRunLoopWithTimeout());
-    std::swap(window_manager_, most_recent_view_manager_);
+    std::swap(window_manager_, most_recent_view_tree_);
   }
 
   // Overridden from testing::Test:
   void TearDown() override {
     view_manager_init_.reset();  // Uses application_impl() from base class.
     ApplicationTestBase::TearDown();
   }
 
-  // Overridden from mojo::InterfaceFactory<mojo::ViewManagerClient>:
+  // Overridden from mojo::InterfaceFactory<mojo::ViewTreeClient>:
   void Create(
       mojo::ApplicationConnection* connection,
-      mojo::InterfaceRequest<mojo::ViewManagerClient> request) override {
+      mojo::InterfaceRequest<mojo::ViewTreeClient> request) override {
     mojo::ViewManager::Create(this, request.Pass());
   }
 
   scoped_ptr<mojo::ViewManagerInit> view_manager_init_;
 
   // Used to receive the most recent view manager loaded by an embed action.
-  ViewManager* most_recent_view_manager_;
+  ViewManager* most_recent_view_tree_;
   // The View Manager connection held by the window manager (app running at the
   // root view).
   ViewManager* window_manager_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(FrameTest);
 };
 
 class TestFrameTreeClient : public FrameTreeClient {
  public:
   TestFrameTreeClient() : connect_count_(0) {}
@@ skipping 74 matching lines @@
   EXPECT_EQ(tree.root()->view()->id(), frames_in_child[0]->frame_id);
   EXPECT_EQ(0u, frames_in_child[0]->parent_id);
   EXPECT_EQ(child_frame->view()->id(), frames_in_child[1]->frame_id);
   EXPECT_EQ(tree.root()->view()->id(), frames_in_child[1]->parent_id);
 
   // We should have gotten notification of the add.
   EXPECT_EQ(1u, root_client.adds().size());
 }
 
 }  // namespace mandoline