Reenable WindowTreeClientUnittests

components/mus/ws/window_tree_client_unittest.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 <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 39 matching lines @@
 
 void WindowTreeResultCallback(base::RunLoop* run_loop,
                               std::vector<TestWindow>* windows,
                               Array<WindowDataPtr> results) {
   WindowDatasToTestWindows(results, windows);
   run_loop->Quit();
 }
 
 void EmbedCallbackImpl(base::RunLoop* run_loop,
                        bool* result_cache,
-                       bool result,
-                       ConnectionSpecificId connection_id) {
+                       bool result) {
   *result_cache = result;
   run_loop->Quit();
 }
 
 // -----------------------------------------------------------------------------
 
 bool EmbedUrl(mojo::Connector* connector,
               WindowTree* tree,
               const String& url,
               Id root_id) {
@@ skipping 197 matching lines @@
     if (wait_state_.get() &&
         tracker_.changes()->size() >= wait_state_->change_count) {
       wait_state_->run_loop.Quit();
     }
   }
 
   // WindowTreeClient:
   void OnEmbed(ConnectionSpecificId connection_id,
                WindowDataPtr root,
                mojom::WindowTreePtr tree,
-               Id focused_window_id,
-               uint32_t access_policy) override {
+               Id focused_window_id) override {
     // TODO(sky): add coverage of |focused_window_id|.
     ASSERT_TRUE(root);
     root_window_id_ = root->window_id;
     tree_ = std::move(tree);
     connection_id_ = connection_id;
     tracker()->OnEmbed(connection_id, std::move(root));
     if (embed_run_loop_)
       embed_run_loop_->Quit();
   }
   void OnEmbeddedAppDisconnected(Id window_id) override {
@@ skipping 247 matching lines @@
       WindowTree* owner,
       Id root_id,
       int* connection_id) {
     return EstablishConnectionViaEmbedWithPolicyBitmask(owner, root_id,
                                                         connection_id);
   }
 
   scoped_ptr<TestWindowTreeClientImpl>
   EstablishConnectionViaEmbedWithPolicyBitmask(WindowTree* owner,
                                                Id root_id,
-                                               uint32_t policy_bitmask,
                                                int* connection_id) {
     if (!EmbedUrl(connector(), owner, test_name(), root_id)) {
       ADD_FAILURE() << "Embed() failed";
       return nullptr;
     }
     scoped_ptr<TestWindowTreeClientImpl> client =
         client_factory_->WaitForInstance();
     if (!client.get()) {
       ADD_FAILURE() << "WaitForInstance failed";
       return nullptr;
@@ skipping 131 matching lines @@
   // And window 4 should not be visible to connection 3.
   {
     std::vector<TestWindow> windows;
     GetWindowTree(wt3(), window_2_3, &windows);
     EXPECT_EQ("no windows", SingleWindowDescription(windows));
   }
 }
 
 // Verifies once Embed() has been invoked the parent connection can't see any
 // children.
-TEST_F(WindowTreeClientTest, CantAccessChildrenOfEmbeddedWindow) {
+TEST_F(WindowTreeClientTest, DISABLED_CantAccessChildrenOfEmbeddedWindow) {
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
 
   Id window_1_1 = BuildWindowId(connection_id_1(), 1);
   Id window_2_2 = wt_client2()->NewWindow(2);
   ASSERT_TRUE(window_2_2);
   ASSERT_TRUE(wt_client2()->AddWindow(window_1_1, window_2_2));
 
   ASSERT_NO_FATAL_FAILURE(EstablishThirdConnection(wt2(), window_2_2));
 
   Id window_3_3 = wt_client3()->NewWindow(3);
@@ skipping 28 matching lines @@
     // but the ids are in the id space of client2, which is not the same as
     // the id space of wt1().
     EXPECT_EQ("window=2,1 parent=1,1", windows[1].ToString());
     // Same thing here, we really want to test for
     // WindowParentToString(window_3_3, window_2_2).
     EXPECT_EQ("window=3,1 parent=2,1", windows[2].ToString());
   }
 }
 
 // Verifies once Embed() has been invoked the parent can't mutate the children.
-TEST_F(WindowTreeClientTest, CantModifyChildrenOfEmbeddedWindow) {
+TEST_F(WindowTreeClientTest, DISABLED_CantModifyChildrenOfEmbeddedWindow) {
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
 
   Id window_1_1 = BuildWindowId(connection_id_1(), 1);
   Id window_2_1 = wt_client2()->NewWindow(1);
   ASSERT_TRUE(window_2_1);
   ASSERT_TRUE(wt_client2()->AddWindow(window_1_1, window_2_1));
 
   ASSERT_NO_FATAL_FAILURE(EstablishThirdConnection(wt2(), window_2_1));
 
   Id window_2_2 = wt_client2()->NewWindow(2);
@@ skipping 56 matching lines @@
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(false));
 
   // Make 3 a child of 2.
   ASSERT_TRUE(wt_client1()->AddWindow(window_1_2, window_1_3));
 
   // Try to make 2 a child of 3, this should fail since 2 is an ancestor of 3.
   EXPECT_FALSE(wt_client1()->AddWindow(window_1_3, window_1_2));
 }
 
 // Verifies adding to root sends right notifications.
-TEST_F(WindowTreeClientTest, AddToRoot) {
+TEST_F(WindowTreeClientTest, DISABLED_AddToRoot) {
   // Create the embed point now so that the ids line up.
   Id window_1_1 = wt_client1()->NewWindow(1);
   ASSERT_TRUE(window_1_1);
   Id window_1_21 = wt_client1()->NewWindow(21);
   Id window_1_3 = wt_client1()->NewWindow(3);
   ASSERT_TRUE(window_1_21);
   ASSERT_TRUE(window_1_3);
 
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(false));
   changes2()->clear();
 
   // Make 3 a child of 21.
   ASSERT_TRUE(wt_client1()->AddWindow(window_1_21, window_1_3));
 
   // Make 21 a child of 1.
   ASSERT_TRUE(wt_client1()->AddWindow(window_1_1, window_1_21));
 
   // Connection 2 should not be told anything (because the window is from a
   // different connection). Create a window to ensure we got a response from
   // the server.
   ASSERT_TRUE(wt_client2()->NewWindow(100));
   EXPECT_TRUE(changes2()->empty());
 }
 
 // Verifies HierarchyChanged is correctly sent for various adds/removes.
-TEST_F(WindowTreeClientTest, WindowHierarchyChangedWindows) {
+TEST_F(WindowTreeClientTest, DISABLED_WindowHierarchyChangedWindows) {
   // Create the embed point now so that the ids line up.
   Id window_1_1 = wt_client1()->NewWindow(1);
   // 1,2->1,11.
   Id window_1_2 = wt_client1()->NewWindow(2);
   ASSERT_TRUE(window_1_2);
   ASSERT_TRUE(wt_client1()->SetWindowVisibility(window_1_2, true));
   Id window_1_11 = wt_client1()->NewWindow(11);
   ASSERT_TRUE(window_1_11);
   ASSERT_TRUE(wt_client1()->SetWindowVisibility(window_1_11, true));
   ASSERT_TRUE(wt_client1()->AddWindow(window_1_2, window_1_11));
@@ skipping 253 matching lines @@
     wt_client1_->WaitForChangeCount(1);
     EXPECT_EQ("HierarchyChanged window=" + IdToString(window_2_1) +
                   " new_parent=" + IdToString(window_1_1) + " old_parent=null",
               SingleChangeToDescription(*changes1()));
     EXPECT_EQ("[" + WindowParentToString(window_2_1, window_1_1) + "]",
               ChangeWindowDescription(*changes1()));
   }
 }
 
 // Assertions for GetWindowTree.
-TEST_F(WindowTreeClientTest, GetWindowTree) {
+TEST_F(WindowTreeClientTest, DISABLED_GetWindowTree) {
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
   Id window_1_1 = BuildWindowId(connection_id_1(), 1);
 
   // Create 11 in first connection and make it a child of 1.
   Id window_1_11 = wt_client1()->NewWindow(11);
   ASSERT_TRUE(window_1_11);
   ASSERT_TRUE(wt_client1()->AddWindow(root_window_id(), window_1_1));
   ASSERT_TRUE(wt_client1()->AddWindow(window_1_1, window_1_11));
 
   // Create two windows in second connection, 2 and 3, both children of 1.
@@ skipping 483 matching lines @@
   // Set back to null.
   ASSERT_TRUE(wt_client1()->SetWindowProperty(window_1_1, "one", NULL));
   {
     wt_client2_->WaitForChangeCount(1);
     EXPECT_EQ("PropertyChanged window=" + IdToString(window_1_1) +
                   " key=one value=NULL",
               SingleChangeToDescription(*changes2()));
   }
 }
 
-TEST_F(WindowTreeClientTest, OnEmbeddedAppDisconnected) {
+TEST_F(WindowTreeClientTest, DISABLED_OnEmbeddedAppDisconnected) {
   // Create connection 2 and 3.
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
   Id window_1_1 = BuildWindowId(connection_id_1(), 1);
   Id window_2_1 = wt_client2()->NewWindow(1);
   ASSERT_TRUE(window_2_1);
   ASSERT_TRUE(wt_client2()->AddWindow(window_1_1, window_2_1));
   changes2()->clear();
   ASSERT_NO_FATAL_FAILURE(EstablishThirdConnection(wt2(), window_2_1));
 
   // Connection 1 should get a hierarchy change for window_2_1.
@@ skipping 59 matching lines @@
   TestWindowTreeClientImpl client2;
   mojom::WindowTreeClientPtr client2_ptr;
   mojo::Binding<WindowTreeClient> client2_binding(&client2, &client2_ptr);
   ASSERT_TRUE(Embed(wt1(), BuildWindowId(connection_id_1(), 1),
                     std::move(client2_ptr)));
   client2.WaitForOnEmbed();
   EXPECT_EQ("OnEmbed",
             SingleChangeToDescription(*client2.tracker()->changes()));
 }
 
-TEST_F(WindowTreeClientTest, EmbedFailsFromOtherConnection) {
+TEST_F(WindowTreeClientTest, DISABLED_EmbedFailsFromOtherConnection) {
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
 
   Id window_1_1 = BuildWindowId(connection_id_1(), 1);
   Id window_2_1 = wt_client2()->NewWindow(1);
   ASSERT_TRUE(window_2_1);
   ASSERT_TRUE(wt_client2()->AddWindow(window_1_1, window_2_1));
   ASSERT_NO_FATAL_FAILURE(EstablishThirdConnection(wt2(), window_2_1));
 
   Id window_3_3 = wt_client3()->NewWindow(3);
   ASSERT_TRUE(window_3_3);
@@ skipping 16 matching lines @@
 
   changes2()->clear();
 
   // Establish a third connection in window_2_1.
   ASSERT_NO_FATAL_FAILURE(EstablishThirdConnection(wt1(), window_2_1));
 
   ASSERT_TRUE(wt_client2()->WaitForAllMessages());
   EXPECT_EQ(std::string(), SingleChangeToDescription(*changes2()));
 }
 
-TEST_F(WindowTreeClientTest, CantEmbedFromConnectionRoot) {
+TEST_F(WindowTreeClientTest, DISABLED_CantEmbedFromConnectionRoot) {
   // Shouldn't be able to embed into the root.
   ASSERT_FALSE(EmbedUrl(connector(), wt1(), test_name(), root_window_id()));
 
   // Even though the call above failed a WindowTreeClient was obtained. We need
   // to
   // wait for it else we throw off the next connect.
   WaitForWindowTreeClient();
 
   // Don't allow a connection to embed into its own root.
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
@@ skipping 164 matching lines @@
 
 // TODO(sky): make sure coverage of what was
 // WindowManagerTest.SecondEmbedRoot_InitService and
 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window
 // manager
 // tests.
 
 }  // namespace test
 }  // namespace ws
 }  // namespace mus