Changes how window manager obtains WindowTree from mus

components/mus/ws/user_display_manager_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/atomicops.h"
 #include "base/macros.h"
@@ skipping 91 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(UserDisplayManagerTest);
 };
 
 TEST_F(UserDisplayManagerTest, OnlyNotifyWhenFrameDecorationsSet) {
   window_server_delegate_.set_num_displays_to_create(1);
 
   const UserId kUserId1 = "2";
   TestDisplayManagerObserver display_manager_observer1;
   DisplayManager* display_manager = window_server_->display_manager();
-  WindowManagerFactoryRegistryTestApi(
-      window_server_->window_manager_factory_registry())
-      .AddService(kUserId1, &test_window_manager_factory_);
+  WindowManagerWindowTreeFactorySetTestApi(
+      window_server_->window_manager_window_tree_factory_set())
+      .Add(kUserId1);
   UserDisplayManager* user_display_manager1 =
       display_manager->GetUserDisplayManager(kUserId1);
   ASSERT_TRUE(user_display_manager1);
   UserDisplayManagerTestApi(user_display_manager1)
       .SetTestObserver(&display_manager_observer1);
   // Observer should not have been notified yet.
   EXPECT_EQ(std::string(),
             display_manager_observer1.GetAndClearObserverCalls());
 
   // Set the frame decoration values, which should trigger sending immediately.
   ASSERT_EQ(1u, display_manager->displays().size());
   Display* display1 = *display_manager->displays().begin();
   display1->GetWindowManagerStateForUser(kUserId1)->SetFrameDecorationValues(
       CreateDefaultFrameDecorationValues());
   EXPECT_EQ("OnDisplays 1",
             display_manager_observer1.GetAndClearObserverCalls());
 
   UserDisplayManagerTestApi(user_display_manager1).SetTestObserver(nullptr);
 }
 
 TEST_F(UserDisplayManagerTest, AddObserverAfterFrameDecorationsSet) {
   window_server_delegate_.set_num_displays_to_create(1);
 
   const UserId kUserId1 = "2";
   TestDisplayManagerObserver display_manager_observer1;
   DisplayManager* display_manager = window_server_->display_manager();
-  WindowManagerFactoryRegistryTestApi(
-      window_server_->window_manager_factory_registry())
-      .AddService(kUserId1, &test_window_manager_factory_);
+  WindowManagerWindowTreeFactorySetTestApi(
+      window_server_->window_manager_window_tree_factory_set())
+      .Add(kUserId1);
   UserDisplayManager* user_display_manager1 =
       display_manager->GetUserDisplayManager(kUserId1);
   ASSERT_TRUE(user_display_manager1);
   ASSERT_EQ(1u, display_manager->displays().size());
   Display* display1 = *display_manager->displays().begin();
   display1->GetWindowManagerStateForUser(kUserId1)->SetFrameDecorationValues(
       CreateDefaultFrameDecorationValues());
 
   UserDisplayManagerTestApi(user_display_manager1)
       .SetTestObserver(&display_manager_observer1);
   EXPECT_EQ("OnDisplays 1",
             display_manager_observer1.GetAndClearObserverCalls());
 
   UserDisplayManagerTestApi(user_display_manager1).SetTestObserver(nullptr);
 }
 
 TEST_F(UserDisplayManagerTest, AddRemoveDisplay) {
   window_server_delegate_.set_num_displays_to_create(1);
 
   const UserId kUserId1 = "2";
   TestDisplayManagerObserver display_manager_observer1;
   DisplayManager* display_manager = window_server_->display_manager();
-  WindowManagerFactoryRegistryTestApi(
-      window_server_->window_manager_factory_registry())
-      .AddService(kUserId1, &test_window_manager_factory_);
+  WindowManagerWindowTreeFactorySetTestApi(
+      window_server_->window_manager_window_tree_factory_set())
+      .Add(kUserId1);
   UserDisplayManager* user_display_manager1 =
       display_manager->GetUserDisplayManager(kUserId1);
   ASSERT_TRUE(user_display_manager1);
   ASSERT_EQ(1u, display_manager->displays().size());
   Display* display1 = *display_manager->displays().begin();
   display1->GetWindowManagerStateForUser(kUserId1)->SetFrameDecorationValues(
       CreateDefaultFrameDecorationValues());
   UserDisplayManagerTestApi(user_display_manager1)
       .SetTestObserver(&display_manager_observer1);
   EXPECT_EQ("OnDisplays 1",
@@ skipping 19 matching lines @@
 
   UserDisplayManagerTestApi(user_display_manager1).SetTestObserver(nullptr);
 }
 
 TEST_F(UserDisplayManagerTest, NegativeCoordinates) {
   window_server_delegate_.set_num_displays_to_create(1);
 
   const UserId kUserId1 = "2";
   TestDisplayManagerObserver display_manager_observer1;
   DisplayManager* display_manager = window_server_->display_manager();
-  WindowManagerFactoryRegistryTestApi(
-      window_server_->window_manager_factory_registry())
-      .AddService(kUserId1, &test_window_manager_factory_);
+  WindowManagerWindowTreeFactorySetTestApi(
+      window_server_->window_manager_window_tree_factory_set())
+      .Add(kUserId1);
   UserDisplayManager* user_display_manager1 =
       display_manager->GetUserDisplayManager(kUserId1);
   ASSERT_TRUE(user_display_manager1);
 
   user_display_manager1->OnMouseCursorLocationChanged(gfx::Point(-10, -11));
 
   base::subtle::Atomic32* cursor_location_memory = nullptr;
   mojo::ScopedSharedBufferHandle handle =
       user_display_manager1->GetCursorLocationMemory();
   MojoResult result = mojo::MapBuffer(
       handle.get(), 0,
       sizeof(base::subtle::Atomic32),
       reinterpret_cast<void**>(&cursor_location_memory),
       MOJO_MAP_BUFFER_FLAG_NONE);
   ASSERT_EQ(MOJO_RESULT_OK, result);
 
   base::subtle::Atomic32 location =
       base::subtle::NoBarrier_Load(cursor_location_memory);
   EXPECT_EQ(gfx::Point(static_cast<int16_t>(location >> 16),
                        static_cast<int16_t>(location & 0xFFFF)),
             gfx::Point(-10, -11));
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace mus