Delete WindowManagerWindowTreeFactorySetTestApi.

services/ui/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 62 matching lines @@
  private:
   WindowServerTestHelper ws_test_helper_;
   DISALLOW_COPY_AND_ASSIGN(DisplayTest);
 };
 
 TEST_F(DisplayTest, CallsCreateDefaultDisplays) {
   const int kNumHostsToCreate = 2;
   window_server_delegate()->CreateDisplays(kNumHostsToCreate);
 
   DisplayManager* display_manager = window_server()->display_manager();
-  WindowManagerWindowTreeFactorySetTestApi(
-      window_server()->window_manager_window_tree_factory_set())
-      .Add(kTestId1);
+  AddWindowManager(window_server(), 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(GetWindowManagerStateForUser(display, kTestId1));
     EXPECT_FALSE(GetWindowManagerStateForUser(display, kTestId2));
   }
 
   // Add another registry, should trigger creation of another wm.
-  WindowManagerWindowTreeFactorySetTestApi(
-      window_server()->window_manager_window_tree_factory_set())
-      .Add(kTestId2);
+  AddWindowManager(window_server(), kTestId2);
   for (Display* display : display_manager->displays()) {
     ASSERT_EQ(2u, display->num_window_manger_states());
     WindowManagerDisplayRoot* root1 =
         display->GetWindowManagerDisplayRootForUser(kTestId1);
     ASSERT_TRUE(root1);
     WindowManagerDisplayRoot* root2 =
         display->GetWindowManagerDisplayRootForUser(kTestId2);
     ASSERT_TRUE(root2);
     // Verify the two states have different roots.
     EXPECT_NE(root1, root2);
     EXPECT_NE(root1->root(), root2->root());
   }
 }
 
 TEST_F(DisplayTest, Destruction) {
   window_server_delegate()->CreateDisplays(1);
 
-  WindowManagerWindowTreeFactorySetTestApi(
-      window_server()->window_manager_window_tree_factory_set())
-      .Add(kTestId1);
+  AddWindowManager(window_server(), kTestId1);
 
   // Add another registry, should trigger creation of another wm.
   DisplayManager* display_manager = window_server()->display_manager();
-  WindowManagerWindowTreeFactorySetTestApi(
-      window_server()->window_manager_window_tree_factory_set())
-      .Add(kTestId2);
+  AddWindowManager(window_server(), 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 = GetWindowManagerStateForUser(display, kTestId1);
     // Destroy the tree associated with |state|. Should result in deleting
     // |state|.
     window_server()->DestroyTree(state->window_tree());
     ASSERT_EQ(1u, display->num_window_manger_states());
     EXPECT_FALSE(GetWindowManagerStateForUser(display, 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());
   window_server()->display_manager()->DestroyDisplay(display);
   // There is still one tree left.
   EXPECT_EQ(1u, window_server()->num_trees());
   EXPECT_TRUE(window_server_delegate()->got_on_no_more_displays());
 }
 
 TEST_F(DisplayTest, EventStateResetOnUserSwitch) {
   window_server_delegate()->CreateDisplays(1);
 
-  WindowManagerWindowTreeFactorySetTestApi(
-      window_server()->window_manager_window_tree_factory_set())
-      .Add(kTestId1);
-  WindowManagerWindowTreeFactorySetTestApi(
-      window_server()->window_manager_window_tree_factory_set())
-      .Add(kTestId2);
+  AddWindowManager(window_server(), kTestId1);
+  AddWindowManager(window_server(), 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->GetActiveWindowManagerDisplayRoot()->window_manager_state();
   ASSERT_TRUE(active_wms);
   EXPECT_EQ(kTestId1, active_wms->user_id());
@@ skipping 21 matching lines @@
   EXPECT_EQ(kTestId2, active_wms->user_id());
   EXPECT_EQ(gfx::Point(20, 25),
             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()->CreateDisplays(1);
-  WindowManagerWindowTreeFactorySetTestApi(
-      window_server()->window_manager_window_tree_factory_set())
-      .Add(kTestId1);
-  WindowManagerWindowTreeFactorySetTestApi(
-      window_server()->window_manager_window_tree_factory_set())
-      .Add(kTestId2);
+  AddWindowManager(window_server(), kTestId1);
+  AddWindowManager(window_server(), 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 =
       GetWindowManagerStateForUser(display, 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->window_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()->CreateDisplays(1);
-  WindowManagerWindowTreeFactorySetTestApi(
-      window_server()->window_manager_window_tree_factory_set())
-      .Add(kTestId1);
+  AddWindowManager(window_server(), kTestId1);
   TestWindowTreeClient* window_tree_client1 =
       window_server_delegate()->last_client();
   ASSERT_TRUE(window_tree_client1);
-  WindowManagerWindowTreeFactorySetTestApi(
-      window_server()->window_manager_window_tree_factory_set())
-      .Add(kTestId2);
+  AddWindowManager(window_server(), 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 =
       GetWindowManagerStateForUser(display, kTestId2);
   wms_for_id2->window_tree()->AddActivationParent(
       ClientWindowIdForFirstRoot(wms_for_id2->window_tree()));
   ASSERT_TRUE(wms_for_id2);
   EXPECT_FALSE(wms_for_id2->IsActive());
@@ skipping 11 matching lines @@
       ClientWindowIdForFirstRoot(wms_for_id1->window_tree()));
   ClientWindowId child1_id;
   NewWindowInTree(wms_for_id1->window_tree(), &child1_id);
   EXPECT_TRUE(wms_for_id1->IsActive());
   EXPECT_TRUE(wms_for_id1->window_tree()->SetFocus(child1_id));
 }
 
 // Verifies a single tree is used for multiple displays.
 TEST_F(DisplayTest, MultipleDisplays) {
   window_server_delegate()->CreateDisplays(2);
-  WindowManagerWindowTreeFactorySetTestApi(
-      window_server()->window_manager_window_tree_factory_set())
-      .Add(kTestId1);
+  AddWindowManager(window_server(), kTestId1);
   window_server()->user_id_tracker()->SetActiveUserId(kTestId1);
   ASSERT_EQ(1u, window_server_delegate()->bindings()->size());
   TestWindowTreeBinding* window_tree_binding =
       (*window_server_delegate()->bindings())[0];
   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;
@@ skipping 55 matching lines @@
   bool* destroyed_;
 
   DISALLOW_COPY_AND_ASSIGN(ServerWindowDestructionObserver);
 };
 
 }  // namespace
 
 // Assertions around destroying a secondary display.
 TEST_F(DisplayTest, DestroyingDisplayDoesntDelete) {
   window_server_delegate()->CreateDisplays(2);
-  WindowManagerWindowTreeFactorySetTestApi(
-      window_server()->window_manager_window_tree_factory_set())
-      .Add(kTestId1);
+  AddWindowManager(window_server(), kTestId1);
   window_server()->user_id_tracker()->SetActiveUserId(kTestId1);
   ASSERT_EQ(1u, window_server_delegate()->bindings()->size());
   WindowTree* tree = (*window_server_delegate()->bindings())[0]->tree();
   ASSERT_EQ(2u, tree->roots().size());
   Display* secondary_display =
       GetSecondaryDisplay(window_server()->display_manager());
   ASSERT_TRUE(secondary_display);
   bool secondary_root_destroyed = false;
   ServerWindow* secondary_root = GetRootOnDisplay(tree, secondary_display);
   ASSERT_TRUE(secondary_root);
@@ skipping 21 matching lines @@
   ASSERT_EQ(0u, tree_client->tracker()->changes()->size());
 
   // The window should be destroyed when the client says so.
   ASSERT_TRUE(tree->DeleteWindow(secondary_root_id));
   EXPECT_TRUE(secondary_root_destroyed);
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui