Makes SetFocus() notify callback correctly on failure

components/mus/ws/display_unittest.cc

 // Copyright 2016 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 <stdint.h>
 
 #include <string>
 
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 241 matching lines @@
   ASSERT_TRUE(window_tree_client1);
   WindowManagerFactoryRegistryTestApi(
       window_server_->window_manager_factory_registry())
       .AddService(kTestId2, &test_window_manager_factory_);
   window_server_->user_id_tracker()->SetActiveUserId(kTestId1);
   DisplayManager* display_manager = window_server_->display_manager();
   ASSERT_EQ(1u, display_manager->displays().size());
   Display* display = *display_manager->displays().begin();
   WindowManagerState* wms_for_id2 =
       display->GetWindowManagerStateForUser(kTestId2);
+  wms_for_id2->tree()->AddActivationParent(
+      ClientWindowIdForFirstRoot(wms_for_id2->tree()));
   ASSERT_TRUE(wms_for_id2);
   EXPECT_FALSE(wms_for_id2->IsActive());
+  ClientWindowId child2_id;
+  NewWindowInTree(wms_for_id2->tree(), &child2_id);
 
   // Focus should fail for windows in inactive window managers.
-  EXPECT_FALSE(wms_for_id2->tree()->SetFocus(
-      ClientWindowIdForFirstRoot(wms_for_id2->tree())));
+  EXPECT_FALSE(wms_for_id2->tree()->SetFocus(child2_id));
 
   // Focus should succeed for the active window manager.
   WindowManagerState* wms_for_id1 =
       display->GetWindowManagerStateForUser(kTestId1);
   ASSERT_TRUE(wms_for_id1);
+  wms_for_id1->tree()->AddActivationParent(
+      ClientWindowIdForFirstRoot(wms_for_id1->tree()));
+  ClientWindowId child1_id;
+  NewWindowInTree(wms_for_id1->tree(), &child1_id);
   EXPECT_TRUE(wms_for_id1->IsActive());
-  EXPECT_TRUE(wms_for_id1->tree()->SetFocus(
-      ClientWindowIdForFirstRoot(wms_for_id1->tree())));
+  EXPECT_TRUE(wms_for_id1->tree()->SetFocus(child1_id));
 }
 
 // Verifies clients are notified of focus changes in different displays.
 TEST_F(DisplayTest, CrossDisplayFocus) {
   window_server_delegate_.set_num_displays_to_create(2);
   const UserId kTestId1 = "20";
   WindowManagerFactoryRegistryTestApi(
       window_server_->window_manager_factory_registry())
       .AddService(kTestId1, &test_window_manager_factory_);
   window_server_->user_id_tracker()->SetActiveUserId(kTestId1);
@@ skipping 40 matching lines @@
   EXPECT_TRUE(window_tree_binding2->client()->tracker()->changes()->empty());
   window_tree_binding1->client()->tracker()->changes()->clear();
   window_tree_binding2->client()->tracker()->changes()->clear();
   EXPECT_FALSE(display1->GetFocusedWindow());
   EXPECT_EQ(child2, display2->GetFocusedWindow());
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace mus