Changes how window manager obtains WindowTree from mus

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 44 matching lines @@
                                           scoped_refptr<SurfacesState>()));
     window_server_delegate_.set_window_server(window_server_.get());
   }
 
  protected:
   int32_t cursor_id_;
   TestPlatformDisplayFactory platform_display_factory_;
   TestWindowServerDelegate window_server_delegate_;
   std::unique_ptr<WindowServer> window_server_;
   base::MessageLoop message_loop_;
-  TestWindowManagerFactory test_window_manager_factory_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DisplayTest);
 };
 
 TEST_F(DisplayTest, CallsCreateDefaultDisplays) {
   const int kNumHostsToCreate = 2;
   window_server_delegate_.set_num_displays_to_create(kNumHostsToCreate);
 
   const UserId kTestId1 = "2";
   const UserId kTestId2 = "21";
   DisplayManager* display_manager = window_server_->display_manager();
-  WindowManagerFactoryRegistryTestApi(
-      window_server_->window_manager_factory_registry())
-      .AddService(kTestId1, &test_window_manager_factory_);
+  WindowManagerWindowTreeFactorySetTestApi(
+      window_server_->window_manager_window_tree_factory_set())
+      .Add(kTestId1);
   // The first register should trigger creation of the default
   // Displays. There should be kNumHostsToCreate Displays.
   EXPECT_EQ(static_cast<size_t>(kNumHostsToCreate),
             display_manager->displays().size());
 
   // Each host should have a WindowManagerState for kTestId1.
   for (Display* display : display_manager->displays()) {
     EXPECT_EQ(1u, display->num_window_manger_states());
     EXPECT_TRUE(display->GetWindowManagerStateForUser(kTestId1));
     EXPECT_FALSE(display->GetWindowManagerStateForUser(kTestId2));
   }
 
   // Add another registry, should trigger creation of another wm.
-  WindowManagerFactoryRegistryTestApi(
-      window_server_->window_manager_factory_registry())
-      .AddService(kTestId2, &test_window_manager_factory_);
+  WindowManagerWindowTreeFactorySetTestApi(
+      window_server_->window_manager_window_tree_factory_set())
+      .Add(kTestId2);
   for (Display* display : display_manager->displays()) {
     ASSERT_EQ(2u, display->num_window_manger_states());
     WindowManagerState* state1 =
         display->GetWindowManagerStateForUser(kTestId1);
     ASSERT_TRUE(state1);
     WindowManagerState* state2 =
         display->GetWindowManagerStateForUser(kTestId2);
     ASSERT_TRUE(state2);
     // Verify the two states have different roots.
     EXPECT_NE(state1, state2);
     EXPECT_NE(state1->root(), state2->root());
   }
 }
 
 TEST_F(DisplayTest, Destruction) {
   window_server_delegate_.set_num_displays_to_create(1);
 
   const UserId kTestId1 = "2";
   const UserId kTestId2 = "21";
-  WindowManagerFactoryRegistryTestApi(
-      window_server_->window_manager_factory_registry())
-      .AddService(kTestId1, &test_window_manager_factory_);
+  WindowManagerWindowTreeFactorySetTestApi(
+      window_server_->window_manager_window_tree_factory_set())
+      .Add(kTestId1);
 
   // Add another registry, should trigger creation of another wm.
   DisplayManager* display_manager = window_server_->display_manager();
-  WindowManagerFactoryRegistryTestApi(
-      window_server_->window_manager_factory_registry())
-      .AddService(kTestId2, &test_window_manager_factory_);
+  WindowManagerWindowTreeFactorySetTestApi(
+      window_server_->window_manager_window_tree_factory_set())
+      .Add(kTestId2);
   ASSERT_EQ(1u, display_manager->displays().size());
   Display* display = *display_manager->displays().begin();
   ASSERT_EQ(2u, display->num_window_manger_states());
   // There should be two trees, one for each windowmanager.
   EXPECT_EQ(2u, window_server_->num_trees());
 
   {
     WindowManagerState* state = display->GetWindowManagerStateForUser(kTestId1);
     // Destroy the tree associated with |state|. Should result in deleting
     // |state|.
     window_server_->DestroyTree(state->tree());
     ASSERT_EQ(1u, display->num_window_manger_states());
     EXPECT_FALSE(display->GetWindowManagerStateForUser(kTestId1));
     EXPECT_EQ(1u, display_manager->displays().size());
     EXPECT_EQ(1u, window_server_->num_trees());
   }
 
   EXPECT_FALSE(window_server_delegate_.got_on_no_more_displays());
   // Destroy the Display, which should shutdown the trees.
   window_server_->display_manager()->DestroyDisplay(display);
   EXPECT_EQ(0u, window_server_->num_trees());
   EXPECT_TRUE(window_server_delegate_.got_on_no_more_displays());
 }
 
 TEST_F(DisplayTest, EventStateResetOnUserSwitch) {
   window_server_delegate_.set_num_displays_to_create(1);
 
   const UserId kTestId1 = "20";
   const UserId kTestId2 = "201";
-  WindowManagerFactoryRegistryTestApi(
-      window_server_->window_manager_factory_registry())
-      .AddService(kTestId1, &test_window_manager_factory_);
-  WindowManagerFactoryRegistryTestApi(
-      window_server_->window_manager_factory_registry())
-      .AddService(kTestId2, &test_window_manager_factory_);
+  WindowManagerWindowTreeFactorySetTestApi(
+      window_server_->window_manager_window_tree_factory_set())
+      .Add(kTestId1);
+  WindowManagerWindowTreeFactorySetTestApi(
+      window_server_->window_manager_window_tree_factory_set())
+      .Add(kTestId2);
 
   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* active_wms = display->GetActiveWindowManagerState();
   ASSERT_TRUE(active_wms);
   EXPECT_EQ(kTestId1, active_wms->user_id());
 
@@ skipping 19 matching lines @@
             active_wms->event_dispatcher()->mouse_pointer_last_location());
   EXPECT_FALSE(EventDispatcherTestApi(active_wms->event_dispatcher())
                    .AreAnyPointersDown());
 }
 
 // Verifies capture fails when wm is inactive and succeeds when wm is active.
 TEST_F(DisplayTest, SetCaptureFromWindowManager) {
   window_server_delegate_.set_num_displays_to_create(1);
   const UserId kTestId1 = "20";
   const UserId kTestId2 = "201";
-  WindowManagerFactoryRegistryTestApi(
-      window_server_->window_manager_factory_registry())
-      .AddService(kTestId1, &test_window_manager_factory_);
-  WindowManagerFactoryRegistryTestApi(
-      window_server_->window_manager_factory_registry())
-      .AddService(kTestId2, &test_window_manager_factory_);
+  WindowManagerWindowTreeFactorySetTestApi(
+      window_server_->window_manager_window_tree_factory_set())
+      .Add(kTestId1);
+  WindowManagerWindowTreeFactorySetTestApi(
+      window_server_->window_manager_window_tree_factory_set())
+      .Add(kTestId2);
   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);
   ASSERT_TRUE(wms_for_id2);
   EXPECT_FALSE(wms_for_id2->IsActive());
 
   // Create a child of the root that we can set capture on.
   WindowTree* tree = wms_for_id2->tree();
   ClientWindowId child_window_id;
   ASSERT_TRUE(NewWindowInTree(tree, &child_window_id));
 
   WindowTreeTestApi(tree).EnableCapture();
 
   // SetCapture() should fail for user id2 as it is inactive.
   EXPECT_FALSE(tree->SetCapture(child_window_id));
 
   // Make the second user active and verify capture works.
   window_server_->user_id_tracker()->SetActiveUserId(kTestId2);
   EXPECT_TRUE(wms_for_id2->IsActive());
   EXPECT_TRUE(tree->SetCapture(child_window_id));
 }
 
 TEST_F(DisplayTest, FocusFailsForInactiveUser) {
   window_server_delegate_.set_num_displays_to_create(1);
   const UserId kTestId1 = "20";
   const UserId kTestId2 = "201";
-  WindowManagerFactoryRegistryTestApi(
-      window_server_->window_manager_factory_registry())
-      .AddService(kTestId1, &test_window_manager_factory_);
+  WindowManagerWindowTreeFactorySetTestApi(
+      window_server_->window_manager_window_tree_factory_set())
+      .Add(kTestId1);
   TestWindowTreeClient* window_tree_client1 =
       window_server_delegate_.last_client();
   ASSERT_TRUE(window_tree_client1);
-  WindowManagerFactoryRegistryTestApi(
-      window_server_->window_manager_factory_registry())
-      .AddService(kTestId2, &test_window_manager_factory_);
+  WindowManagerWindowTreeFactorySetTestApi(
+      window_server_->window_manager_window_tree_factory_set())
+      .Add(kTestId2);
   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(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(child1_id));
 }
 
-// Verifies clients are notified of focus changes in different displays.
-TEST_F(DisplayTest, CrossDisplayFocus) {
+// Verifies a single tree is used for multiple displays.
+TEST_F(DisplayTest, MultipleDisplays) {
   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_);
+  WindowManagerWindowTreeFactorySetTestApi(
+      window_server_->window_manager_window_tree_factory_set())
+      .Add(kTestId1);
   window_server_->user_id_tracker()->SetActiveUserId(kTestId1);
-  ASSERT_EQ(2u, window_server_delegate_.bindings()->size());
-  TestWindowTreeBinding* window_tree_binding1 =
+  ASSERT_EQ(1u, window_server_delegate_.bindings()->size());
+  TestWindowTreeBinding* window_tree_binding =
       (*window_server_delegate_.bindings())[0];
-  Display* display1 = window_tree_binding1->tree()->GetDisplay(
-      FirstRoot(window_tree_binding1->tree()));
+  WindowTree* tree = window_tree_binding->tree();
+  ASSERT_EQ(2u, tree->roots().size());
+  std::set<const ServerWindow*> roots = tree->roots();
+  auto it = roots.begin();
+  ServerWindow* root1 = tree->GetWindow((*it)->id());
+  ++it;
+  ServerWindow* root2 = tree->GetWindow((*it)->id());
+  ASSERT_NE(root1, root2);
+  Display* display1 = tree->GetDisplay(root1);
   WindowManagerState* display1_wms =
       display1->GetWindowManagerStateForUser(kTestId1);
-  TestWindowTreeBinding* window_tree_binding2 =
-      (*window_server_delegate_.bindings())[1];
-  Display* display2 = window_tree_binding2->tree()->GetDisplay(
-      FirstRoot(window_tree_binding2->tree()));
+  Display* display2 = tree->GetDisplay(root2);
   WindowManagerState* display2_wms =
       display2->GetWindowManagerStateForUser(kTestId1);
-
-  // Create children in both displays.
-  ClientWindowId child1_id;
-  ServerWindow* child1 = NewWindowInTree(display1_wms->tree(), &child1_id);
-  ASSERT_TRUE(child1);
-  child1->set_can_focus(true);
-  ClientWindowId child2_id;
-  ServerWindow* child2 = NewWindowInTree(display2_wms->tree(), &child2_id);
-  ASSERT_TRUE(child2);
-  child2->set_can_focus(true);
-
-  display1->AddActivationParent(FirstRoot(display1_wms->tree()));
-  display2->AddActivationParent(FirstRoot(display2_wms->tree()));
-  FirstRoot(display1_wms->tree())->set_can_focus(true);
-  FirstRoot(display2_wms->tree())->set_can_focus(true);
-  EXPECT_TRUE(display1_wms->tree()->SetFocus(child1_id));
-  EXPECT_EQ(child1, display1->GetFocusedWindow());
-  EXPECT_FALSE(display2->GetFocusedWindow());
-  window_tree_binding1->client()->tracker()->changes()->clear();
-  window_tree_binding2->client()->tracker()->changes()->clear();
-  // Moving focus to display2 should result in notifying display1.
-  EXPECT_TRUE(display2_wms->tree()->SetFocus(child2_id));
-  EXPECT_EQ("Focused id=null",
-            SingleChangeToDescription(
-                *window_tree_binding1->client()->tracker()->changes()));
-  EXPECT_EQ("", SingleChangeToDescription(
-                    *window_tree_binding2->client()->tracker()->changes()));
-  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());
+  EXPECT_EQ(display1_wms->tree(), display2_wms->tree());
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace mus