Update WindowTreeClientTest.OnEmbeddedAppDisconnected

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 1602 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, DISABLED_OnEmbeddedAppDisconnected) {
+TEST_F(WindowTreeClientTest, 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.
   wt_client1_->WaitForChangeCount(1);
   changes1()->clear();
 
   // Close connection 3. Connection 2 (which had previously embedded 3) should
   // be notified of this.
   wt_client3_.reset();
   wt_client2_->WaitForChangeCount(1);
   EXPECT_EQ("OnEmbeddedAppDisconnected window=" + IdToString(window_2_1),
             SingleChangeToDescription(*changes2()));
 
-  wt_client1_->WaitForChangeCount(1);
-  EXPECT_EQ("OnEmbeddedAppDisconnected window=" + IdToString(window_2_1),
-            SingleChangeToDescription(*changes1()));
+  // The closing is only interesting to the root that did the embedding. Other
+  // connections should not be notified of this.
+  wt_client1_->WaitForAllMessages();
+  EXPECT_TRUE(changes1()->empty());
 }
 
 // Verifies when the parent of an Embed() is destroyed the embedded app gets
 // a WindowDeleted (and doesn't trigger a DCHECK).
 TEST_F(WindowTreeClientTest, OnParentOfEmbedDisconnects) {
   // Create connection 2 and 3.
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
   Id window_1_1 = BuildWindowId(connection_id_1(), 1);
   ASSERT_TRUE(wt_client1()->AddWindow(root_window_id(), window_1_1));
   Id window_2_1 = wt_client2()->NewWindow(1);
@@ skipping 258 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