Nukes the windowmanager interface

components/view_manager/view_manager_service_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 "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "components/view_manager/ids.h"
 #include "components/view_manager/public/interfaces/view_manager.mojom.h"
+#include "components/view_manager/public/interfaces/view_manager_root.mojom.h"
 #include "components/view_manager/test_change_tracker.h"
-#include "components/window_manager/public/interfaces/window_manager.mojom.h"
-#include "components/window_manager/public/interfaces/window_manager_internal.mojom.h"
 #include "mojo/application/application_test_base_chromium.h"
 #include "mojo/application/public/cpp/application_delegate.h"
 #include "mojo/application/public/cpp/application_impl.h"
 
 using mojo::ApplicationConnection;
 using mojo::ApplicationDelegate;
 using mojo::Array;
 using mojo::Callback;
 using mojo::ConnectionSpecificId;
 using mojo::ERROR_CODE_NONE;
@@ skipping 365 matching lines @@
     if (run_loop_.get())
       run_loop_->Quit();
   }
 
   scoped_ptr<ViewManagerClientImpl> client_impl_;
   scoped_ptr<base::RunLoop> run_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewManagerClientFactory);
 };
 
-class ViewManagerServiceAppTest
-    : public mojo::test::ApplicationTestBase,
-      public ApplicationDelegate,
-      public mojo::InterfaceFactory<mojo::WindowManagerInternal>,
-      public mojo::WindowManagerInternal {
+class ViewManagerServiceAppTest : public mojo::test::ApplicationTestBase,
+                                  public ApplicationDelegate {
  public:
-  ViewManagerServiceAppTest() : wm_internal_binding_(this) {}
+  ViewManagerServiceAppTest() {}
   ~ViewManagerServiceAppTest() override {}
 
  protected:
   // Returns the changes from the various connections.
-  std::vector<Change>* changes1() { return vm_client1_.tracker()->changes(); }
+  std::vector<Change>* changes1() { return vm_client1_->tracker()->changes(); }
   std::vector<Change>* changes2() { return vm_client2_->tracker()->changes(); }
   std::vector<Change>* changes3() { return vm_client3_->tracker()->changes(); }
 
   // Various connections. |vm1()|, being the first connection, has special
   // permissions (it's treated as the window manager).
   ViewManagerService* vm1() { return vm1_.get(); }
   ViewManagerService* vm2() { return vm_client2_->service(); }
   ViewManagerService* vm3() { return vm_client3_->service(); }
 
   void EstablishSecondConnectionWithRoot(Id root_id) {
@@ skipping 28 matching lines @@
       return nullptr;
     }
     scoped_ptr<ViewManagerClientImpl> client =
         client_factory_.WaitForInstance();
     if (!client.get()) {
       ADD_FAILURE() << "WaitForInstance failed";
       return nullptr;
     }
     client->WaitForOnEmbed();
 
-    const std::string expected_creator =
-        owner == vm1() ? "mojo:window_manager" : application_impl()->url();
-    EXPECT_EQ("OnEmbed creator=" + expected_creator,
+    EXPECT_EQ("OnEmbed creator=" + application_impl()->url(),
               SingleChangeToDescription(*client->tracker()->changes()));
     return client.Pass();
   }
 
   // ApplicationTestBase:
   ApplicationDelegate* GetApplicationDelegate() override { return this; }
   void SetUp() override {
     ApplicationTestBase::SetUp();
     ApplicationConnection* vm_connection =
         application_impl()->ConnectToApplication("mojo:view_manager");
-    vm_connection->AddService(this);
     vm_connection->ConnectToService(&vm1_);
-    vm_connection->ConnectToService(&wm_internal_client_);
-    // Spin a run loop until the view manager service sends us the
-    // ViewManagerClient pipe to use for the "window manager" connection.
-    view_manager_setup_run_loop_.reset(new base::RunLoop);
-    view_manager_setup_run_loop_->Run();
-    view_manager_setup_run_loop_ = nullptr;
+    vm_connection->ConnectToService(&view_manager_root_);
+    vm_connection->AddService(&client_factory_);
+    vm_client1_ = client_factory_.WaitForInstance();
+    ASSERT_TRUE(vm_client1_);
     // Next we should get an embed call on the "window manager" client.
-    vm_client1_.WaitForIncomingMethodCall();
+    vm_client1_->WaitForIncomingMethodCall();
     ASSERT_EQ(1u, changes1()->size());
     EXPECT_EQ(CHANGE_TYPE_EMBED, (*changes1())[0].type);
     // All these tests assume 1 for the client id. The only real assertion here
     // is the client id is not zero, but adding this as rest of code here
     // assumes 1.
     ASSERT_EQ(1, (*changes1())[0].connection_id);
     changes1()->clear();
   }
 
   // ApplicationDelegate implementation.
   bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
     connection->AddService(&client_factory_);
     return true;
   }
 
-  // mojo::InterfaceFactory<mojo::WindowManagerInternal> implementation.
-  void Create(
-      ApplicationConnection* connection,
-      mojo::InterfaceRequest<mojo::WindowManagerInternal> request) override {
-    DCHECK(!wm_internal_binding_.is_bound());
-    wm_internal_binding_.Bind(request.Pass());
-  }
-
-  // mojo::WindowManagerInternal implementation.
-  void SetViewManagerClient(
-      mojo::ScopedMessagePipeHandle view_manager_client_request) override {
-    auto typed_request = mojo::MakeRequest<mojo::ViewManagerClient>(
-        view_manager_client_request.Pass());
-    vm_client1_.Bind(typed_request.Pass());
-    view_manager_setup_run_loop_->Quit();
-  }
-  void OnAccelerator(mojo::EventPtr event) override {}
-
-  mojo::Binding<mojo::WindowManagerInternal> wm_internal_binding_;
-  mojo::WindowManagerInternalClientPtr wm_internal_client_;
-  ViewManagerClientImpl vm_client1_;
+  scoped_ptr<ViewManagerClientImpl> vm_client1_;
   scoped_ptr<ViewManagerClientImpl> vm_client2_;
   scoped_ptr<ViewManagerClientImpl> vm_client3_;
 
+  mojo::ViewManagerRootPtr view_manager_root_;
+
  private:
   mojo::ViewManagerServicePtr vm1_;
   ViewManagerClientFactory client_factory_;
-  scoped_ptr<base::RunLoop> view_manager_setup_run_loop_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(ViewManagerServiceAppTest);
 };
 
 // Verifies two clients/connections get different ids.
 TEST_F(ViewManagerServiceAppTest, TwoClientsGetDifferentConnectionIds) {
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
 
   // It isn't strictly necessary that the second connection gets 2, but these
   // tests are written assuming that is the case. The key thing is the
@@ skipping 259 matching lines @@
   // Set up the hierarchy.
   ASSERT_TRUE(AddView(vm1(), BuildViewId(0, 1), BuildViewId(1, 1)));
   ASSERT_TRUE(AddView(vm2(), BuildViewId(1, 1), BuildViewId(2, 11)));
   ASSERT_TRUE(AddView(vm2(), BuildViewId(2, 2), BuildViewId(2, 21)));
 
   // Remove 11, should result in a hierarchy change for the root.
   {
     changes1()->clear();
     ASSERT_TRUE(RemoveViewFromParent(vm2(), BuildViewId(2, 11)));
 
-    vm_client1_.WaitForChangeCount(1);
+    vm_client1_->WaitForChangeCount(1);
     EXPECT_EQ("HierarchyChanged view=2,11 new_parent=null old_parent=1,1",
               SingleChangeToDescription(*changes1()));
   }
 
   // Add 2 to 1.
   {
     changes1()->clear();
     ASSERT_TRUE(AddView(vm2(), BuildViewId(1, 1), BuildViewId(2, 2)));
 
-    vm_client1_.WaitForChangeCount(1);
+    vm_client1_->WaitForChangeCount(1);
     EXPECT_EQ("HierarchyChanged view=2,2 new_parent=1,1 old_parent=null",
               SingleChangeToDescription(*changes1()));
     EXPECT_EQ(
         "[view=2,2 parent=1,1],"
         "[view=2,21 parent=2,2]",
         ChangeViewDescription(*changes1()));
   }
 }
 
 TEST_F(ViewManagerServiceAppTest, ReorderView) {
@@ skipping 19 matching lines @@
   ASSERT_TRUE(AddView(vm2(), view2_id, view6_id));
   ASSERT_TRUE(AddView(vm2(), view1_id, view3_id));
   ASSERT_TRUE(AddView(vm1(), ViewIdToTransportId(RootViewId()), view4_id));
   ASSERT_TRUE(AddView(vm1(), ViewIdToTransportId(RootViewId()), view5_id));
   ASSERT_TRUE(AddView(vm1(), ViewIdToTransportId(RootViewId()), view1_id));
 
   {
     changes1()->clear();
     ASSERT_TRUE(ReorderView(vm2(), view2_id, view3_id, ORDER_DIRECTION_ABOVE));
 
-    vm_client1_.WaitForChangeCount(1);
+    vm_client1_->WaitForChangeCount(1);
     EXPECT_EQ("Reordered view=2,2 relative=2,3 direction=above",
               SingleChangeToDescription(*changes1()));
   }
 
   {
     changes1()->clear();
     ASSERT_TRUE(ReorderView(vm2(), view2_id, view3_id, ORDER_DIRECTION_BELOW));
 
-    vm_client1_.WaitForChangeCount(1);
+    vm_client1_->WaitForChangeCount(1);
     EXPECT_EQ("Reordered view=2,2 relative=2,3 direction=below",
               SingleChangeToDescription(*changes1()));
   }
 
   // view2 is already below view3.
   EXPECT_FALSE(ReorderView(vm2(), view2_id, view3_id, ORDER_DIRECTION_BELOW));
 
   // view4 & 5 are unknown to connection2_.
   EXPECT_FALSE(ReorderView(vm2(), view4_id, view5_id, ORDER_DIRECTION_ABOVE));
 
@@ skipping 10 matching lines @@
 
 // Verifies DeleteView works.
 TEST_F(ViewManagerServiceAppTest, DeleteView) {
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
   ASSERT_TRUE(CreateView(vm2(), BuildViewId(2, 2)));
 
   // Make 2 a child of 1.
   {
     changes1()->clear();
     ASSERT_TRUE(AddView(vm2(), BuildViewId(1, 1), BuildViewId(2, 2)));
-    vm_client1_.WaitForChangeCount(1);
+    vm_client1_->WaitForChangeCount(1);
     EXPECT_EQ("HierarchyChanged view=2,2 new_parent=1,1 old_parent=null",
               SingleChangeToDescription(*changes1()));
   }
 
   // Delete 2.
   {
     changes1()->clear();
     changes2()->clear();
     ASSERT_TRUE(DeleteView(vm2(), BuildViewId(2, 2)));
     EXPECT_TRUE(changes2()->empty());
 
-    vm_client1_.WaitForChangeCount(1);
+    vm_client1_->WaitForChangeCount(1);
     EXPECT_EQ("ViewDeleted view=2,2", SingleChangeToDescription(*changes1()));
   }
 }
 
 // Verifies DeleteView isn't allowed from a separate connection.
 TEST_F(ViewManagerServiceAppTest, DeleteViewFromAnotherConnectionDisallowed) {
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
   EXPECT_FALSE(DeleteView(vm2(), BuildViewId(1, 1)));
 }
 
 // Verifies if a view was deleted and then reused that other clients are
 // properly notified.
 TEST_F(ViewManagerServiceAppTest, ReuseDeletedViewId) {
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
   ASSERT_TRUE(CreateView(vm2(), BuildViewId(2, 2)));
 
   // Add 2 to 1.
   {
     changes1()->clear();
     ASSERT_TRUE(AddView(vm2(), BuildViewId(1, 1), BuildViewId(2, 2)));
 
-    vm_client1_.WaitForChangeCount(1);
+    vm_client1_->WaitForChangeCount(1);
     EXPECT_EQ("HierarchyChanged view=2,2 new_parent=1,1 old_parent=null",
               SingleChangeToDescription(*changes1()));
     EXPECT_EQ("[view=2,2 parent=1,1]", ChangeViewDescription(*changes1()));
   }
 
   // Delete 2.
   {
     changes1()->clear();
     ASSERT_TRUE(DeleteView(vm2(), BuildViewId(2, 2)));
 
-    vm_client1_.WaitForChangeCount(1);
+    vm_client1_->WaitForChangeCount(1);
     EXPECT_EQ("ViewDeleted view=2,2", SingleChangeToDescription(*changes1()));
   }
 
   // Create 2 again, and add it back to 1. Should get the same notification.
   ASSERT_TRUE(CreateView(vm2(), BuildViewId(2, 2)));
   {
     changes1()->clear();
     ASSERT_TRUE(AddView(vm2(), BuildViewId(1, 1), BuildViewId(2, 2)));
 
-    vm_client1_.WaitForChangeCount(1);
+    vm_client1_->WaitForChangeCount(1);
     EXPECT_EQ("HierarchyChanged view=2,2 new_parent=1,1 old_parent=null",
               SingleChangeToDescription(*changes1()));
     EXPECT_EQ("[view=2,2 parent=1,1]", ChangeViewDescription(*changes1()));
   }
 }
 
 // Assertions for GetViewTree.
 TEST_F(ViewManagerServiceAppTest, GetViewTree) {
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
 
@@ skipping 167 matching lines @@
   // Connection2 should have been told the view was deleted.
   vm_client2_->WaitForChangeCount(1);
   changes2()->clear();
 
   // Create a view in the third connection and parent it to the root.
   ASSERT_TRUE(CreateView(vm3(), BuildViewId(3, 1)));
   ASSERT_TRUE(AddView(vm3(), BuildViewId(1, 1), BuildViewId(3, 1)));
 
   // Connection 1 should have been told about the add (it owns the view).
   {
-    vm_client1_.WaitForChangeCount(1);
+    vm_client1_->WaitForChangeCount(1);
     EXPECT_EQ("HierarchyChanged view=3,1 new_parent=1,1 old_parent=null",
               SingleChangeToDescription(*changes1()));
   }
 
   // Embed 1,1 again.
   {
     changes3()->clear();
 
     // We should get a new connection for the new embedding.
     scoped_ptr<ViewManagerClientImpl> connection4(
@@ skipping 122 matching lines @@
   {
     vm_client2_->WaitForChangeCount(1);
     EXPECT_EQ("VisibilityChanged view=1,2 visible=false",
               SingleChangeToDescription(*changes2()));
   }
 
   changes1()->clear();
   // Show 1,2 from connection 2, connection 1 should be notified.
   ASSERT_TRUE(SetViewVisibility(vm2(), BuildViewId(1, 2), true));
   {
-    vm_client1_.WaitForChangeCount(1);
+    vm_client1_->WaitForChangeCount(1);
     EXPECT_EQ("VisibilityChanged view=1,2 visible=true",
               SingleChangeToDescription(*changes1()));
   }
 
   changes2()->clear();
   // Hide 1,1, connection 2 should be told the draw state changed.
   ASSERT_TRUE(SetViewVisibility(vm1(), BuildViewId(1, 1), false));
   {
     vm_client2_->WaitForChangeCount(1);
     EXPECT_EQ("DrawnStateChanged view=1,2 drawn=false",
               SingleChangeToDescription(*changes2()));
   }
 
   changes2()->clear();
   // Show 1,1 from connection 1. Connection 2 should see this.
   ASSERT_TRUE(SetViewVisibility(vm1(), BuildViewId(1, 1), true));
   {
     vm_client2_->WaitForChangeCount(1);
     EXPECT_EQ("DrawnStateChanged view=1,2 drawn=true",
               SingleChangeToDescription(*changes2()));
   }
 
   // Change visibility of 2,3, connection 1 should see this.
   changes1()->clear();
   ASSERT_TRUE(SetViewVisibility(vm2(), BuildViewId(2, 3), false));
   {
-    vm_client1_.WaitForChangeCount(1);
+    vm_client1_->WaitForChangeCount(1);
     EXPECT_EQ("VisibilityChanged view=2,3 visible=false",
               SingleChangeToDescription(*changes1()));
   }
 
   changes2()->clear();
   // Remove 1,1 from the root, connection 2 should see drawn state changed.
   ASSERT_TRUE(RemoveViewFromParent(vm1(), BuildViewId(1, 1)));
   {
     vm_client2_->WaitForChangeCount(1);
     EXPECT_EQ("DrawnStateChanged view=1,2 drawn=false",
@@ skipping 91 matching lines @@
   EXPECT_EQ("ViewDeleted view=2,3", SingleChangeToDescription(*changes3()));
 }
 
 // Verifies ViewManagerServiceImpl doesn't incorrectly erase from its internal
 // map when a view from another connection with the same view_id is removed.
 TEST_F(ViewManagerServiceAppTest, DontCleanMapOnDestroy) {
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
   ASSERT_TRUE(CreateView(vm2(), BuildViewId(2, 1)));
   changes1()->clear();
   vm_client2_.reset();
-  vm_client1_.WaitForChangeCount(1);
+  vm_client1_->WaitForChangeCount(1);
   EXPECT_EQ("OnEmbeddedAppDisconnected view=1,1",
             SingleChangeToDescription(*changes1()));
   std::vector<TestView> views;
   GetViewTree(vm1(), BuildViewId(1, 1), &views);
   EXPECT_FALSE(views.empty());
 }
 
 TEST_F(ViewManagerServiceAppTest, CloneAndAnimate) {
   // Create connection 2 and 3.
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
   ASSERT_TRUE(AddView(vm1(), BuildViewId(0, 1), BuildViewId(1, 1)));
   ASSERT_TRUE(CreateView(vm2(), BuildViewId(2, 2)));
   ASSERT_TRUE(CreateView(vm2(), BuildViewId(2, 3)));
   ASSERT_TRUE(AddView(vm2(), BuildViewId(1, 1), BuildViewId(2, 2)));
   ASSERT_TRUE(AddView(vm2(), BuildViewId(2, 2), BuildViewId(2, 3)));
   changes2()->clear();
 
   ASSERT_TRUE(WaitForAllMessages(vm1()));
   changes1()->clear();
 
-  wm_internal_client_->CloneAndAnimate(BuildViewId(2, 3));
+  view_manager_root_->CloneAndAnimate(BuildViewId(2, 3));
   ASSERT_TRUE(WaitForAllMessages(vm1()));
 
   ASSERT_TRUE(WaitForAllMessages(vm1()));
   ASSERT_TRUE(WaitForAllMessages(vm2()));
 
   // No messages should have been received.
   EXPECT_TRUE(changes1()->empty());
   EXPECT_TRUE(changes2()->empty());
 
   // No one should be able to see the cloned tree.
   std::vector<TestView> views;
   GetViewTree(vm1(), BuildViewId(1, 1), &views);
   EXPECT_FALSE(HasClonedView(views));
   views.clear();
 
   GetViewTree(vm2(), BuildViewId(1, 1), &views);
   EXPECT_FALSE(HasClonedView(views));
 }
 
 // Verifies Embed() works when supplying a ViewManagerClient.
 TEST_F(ViewManagerServiceAppTest, EmbedSupplyingViewManagerClient) {
   ASSERT_TRUE(CreateView(vm1(), BuildViewId(1, 1)));
 
   ViewManagerClientImpl client2;
   mojo::ViewManagerClientPtr client2_ptr;
   mojo::Binding<ViewManagerClient> client2_binding(&client2, &client2_ptr);
   ASSERT_TRUE(Embed(vm1(), BuildViewId(1, 1), client2_ptr.Pass()));
   client2.WaitForOnEmbed();
-  EXPECT_EQ("OnEmbed creator=mojo:window_manager",
+  EXPECT_EQ("OnEmbed creator=" + application_impl()->url(),
             SingleChangeToDescription(*client2.tracker()->changes()));
 }
 
 // TODO(sky): need to better track changes to initial connection. For example,
 // that SetBounsdViews/AddView and the like don't result in messages to the
 // originating connection.
 
 // TODO(sky): make sure coverage of what was
 // ViewManagerTest.SecondEmbedRoot_InitService and
 // ViewManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window manager
 // tests.
 
 }  // namespace view_manager