Reenable WindowTreeClientUnittests

components/mus/ws/window_tree_client_unittest.cc

Index: components/mus/ws/window_tree_client_unittest.cc
diff --git a/components/mus/ws/window_tree_client_unittest.cc b/components/mus/ws/window_tree_client_unittest.cc
index f98da25a56327e126a56af1cd7b09645f1cc251d..ac55ee609ce6c24029f29dd832457612d12ff6e2 100644
--- a/components/mus/ws/window_tree_client_unittest.cc
+++ b/components/mus/ws/window_tree_client_unittest.cc
@@ -57,8 +57,7 @@ void WindowTreeResultCallback(base::RunLoop* run_loop,
 
 void EmbedCallbackImpl(base::RunLoop* run_loop,
                        bool* result_cache,
-                       bool result,
-                       ConnectionSpecificId connection_id) {
+                       bool result) {
   *result_cache = result;
   run_loop->Quit();
 }
@@ -276,8 +275,7 @@ class TestWindowTreeClientImpl : public mojom::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;
@@ -545,7 +543,6 @@ class WindowTreeClientTest : public WindowServerShellTestBase {
   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";
@@ -697,7 +694,7 @@ TEST_F(WindowTreeClientTest, WindowsRemovedWhenEmbedding) {
 
 // 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);
@@ -746,7 +743,7 @@ TEST_F(WindowTreeClientTest, CantAccessChildrenOfEmbeddedWindow) {
 }
 
 // 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);
@@ -823,7 +820,7 @@ TEST_F(WindowTreeClientTest, AddAncestorFails) {
 }
 
 // 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);
@@ -849,7 +846,7 @@ TEST_F(WindowTreeClientTest, AddToRoot) {
 }
 
 // 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.
@@ -1123,7 +1120,7 @@ TEST_F(WindowTreeClientTest, ReuseDeletedWindowId) {
 }
 
 // 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);
 
@@ -1627,7 +1624,7 @@ TEST_F(WindowTreeClientTest, SetWindowProperty) {
   }
 }
 
-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);
@@ -1707,7 +1704,7 @@ TEST_F(WindowTreeClientTest, EmbedSupplyingWindowTreeClient) {
             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);
@@ -1744,7 +1741,7 @@ TEST_F(WindowTreeClientTest, EmbedFromOtherConnection) {
   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()));