Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(377)

Unified Diff: services/ui/ws/user_display_manager_unittest.cc

Issue 2481013008: Delete WindowManagerWindowTreeFactorySetTestApi. (Closed)
Patch Set: Make const ref. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « services/ui/ws/test_utils.cc ('k') | services/ui/ws/window_manager_state_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/user_display_manager_unittest.cc
diff --git a/services/ui/ws/user_display_manager_unittest.cc b/services/ui/ws/user_display_manager_unittest.cc
index b99b2c82b5dbd24c729de130b0f8788abfe561ec..ee827f0cf209e2818469b46ff184d4df4c36ef53 100644
--- a/services/ui/ws/user_display_manager_unittest.cc
+++ b/services/ui/ws/user_display_manager_unittest.cc
@@ -133,9 +133,7 @@ TEST_F(UserDisplayManagerTest, OnlyNotifyWhenFrameDecorationsSet) {
const UserId kUserId1 = "2";
TestDisplayManagerObserver display_manager_observer1;
DisplayManager* display_manager = window_server()->display_manager();
- WindowManagerWindowTreeFactorySetTestApi(
- window_server()->window_manager_window_tree_factory_set())
- .Add(kUserId1);
+ AddWindowManager(window_server(), kUserId1);
UserDisplayManager* user_display_manager1 =
display_manager->GetUserDisplayManager(kUserId1);
ASSERT_TRUE(user_display_manager1);
@@ -163,9 +161,7 @@ TEST_F(UserDisplayManagerTest, AddObserverAfterFrameDecorationsSet) {
const UserId kUserId1 = "2";
TestDisplayManagerObserver display_manager_observer1;
DisplayManager* display_manager = window_server()->display_manager();
- WindowManagerWindowTreeFactorySetTestApi(
- window_server()->window_manager_window_tree_factory_set())
- .Add(kUserId1);
+ AddWindowManager(window_server(), kUserId1);
UserDisplayManager* user_display_manager1 =
display_manager->GetUserDisplayManager(kUserId1);
ASSERT_TRUE(user_display_manager1);
@@ -189,9 +185,7 @@ TEST_F(UserDisplayManagerTest, AddRemoveDisplay) {
const UserId kUserId1 = "2";
TestDisplayManagerObserver display_manager_observer1;
DisplayManager* display_manager = window_server()->display_manager();
- WindowManagerWindowTreeFactorySetTestApi(
- window_server()->window_manager_window_tree_factory_set())
- .Add(kUserId1);
+ AddWindowManager(window_server(), kUserId1);
UserDisplayManager* user_display_manager1 =
display_manager->GetUserDisplayManager(kUserId1);
ASSERT_TRUE(user_display_manager1);
@@ -228,9 +222,7 @@ TEST_F(UserDisplayManagerTest, NegativeCoordinates) {
const UserId kUserId1 = "2";
TestDisplayManagerObserver display_manager_observer1;
DisplayManager* display_manager = window_server()->display_manager();
- WindowManagerWindowTreeFactorySetTestApi(
- window_server()->window_manager_window_tree_factory_set())
- .Add(kUserId1);
+ AddWindowManager(window_server(), kUserId1);
UserDisplayManager* user_display_manager1 =
display_manager->GetUserDisplayManager(kUserId1);
ASSERT_TRUE(user_display_manager1);
« no previous file with comments | « services/ui/ws/test_utils.cc ('k') | services/ui/ws/window_manager_state_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698