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

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

Issue 2484223006: Remove CreateDefaultDisplay(). (Closed)
Patch Set: Remove debug LOG. 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/cursor_unittest.cc ('k') | services/ui/ws/test_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/display_unittest.cc
diff --git a/services/ui/ws/display_unittest.cc b/services/ui/ws/display_unittest.cc
index 34324898c87e166b9670df9ade8e66f020e88a64..6199b5e9f2b42fd5bae280bbc408c934c2ab4d0e 100644
--- a/services/ui/ws/display_unittest.cc
+++ b/services/ui/ws/display_unittest.cc
@@ -77,7 +77,7 @@ class DisplayTest : public testing::Test {
TEST_F(DisplayTest, CallsCreateDefaultDisplays) {
const int kNumHostsToCreate = 2;
- window_server_delegate()->set_num_displays_to_create(kNumHostsToCreate);
+ window_server_delegate()->CreateDisplays(kNumHostsToCreate);
DisplayManager* display_manager = window_server()->display_manager();
WindowManagerWindowTreeFactorySetTestApi(
@@ -114,7 +114,7 @@ TEST_F(DisplayTest, CallsCreateDefaultDisplays) {
}
TEST_F(DisplayTest, Destruction) {
- window_server_delegate()->set_num_displays_to_create(1);
+ window_server_delegate()->CreateDisplays(1);
WindowManagerWindowTreeFactorySetTestApi(
window_server()->window_manager_window_tree_factory_set())
@@ -150,7 +150,7 @@ TEST_F(DisplayTest, Destruction) {
}
TEST_F(DisplayTest, EventStateResetOnUserSwitch) {
- window_server_delegate()->set_num_displays_to_create(1);
+ window_server_delegate()->CreateDisplays(1);
WindowManagerWindowTreeFactorySetTestApi(
window_server()->window_manager_window_tree_factory_set())
@@ -198,7 +198,7 @@ TEST_F(DisplayTest, EventStateResetOnUserSwitch) {
// 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);
+ window_server_delegate()->CreateDisplays(1);
WindowManagerWindowTreeFactorySetTestApi(
window_server()->window_manager_window_tree_factory_set())
.Add(kTestId1);
@@ -231,7 +231,7 @@ TEST_F(DisplayTest, SetCaptureFromWindowManager) {
}
TEST_F(DisplayTest, FocusFailsForInactiveUser) {
- window_server_delegate()->set_num_displays_to_create(1);
+ window_server_delegate()->CreateDisplays(1);
WindowManagerWindowTreeFactorySetTestApi(
window_server()->window_manager_window_tree_factory_set())
.Add(kTestId1);
@@ -271,7 +271,7 @@ TEST_F(DisplayTest, FocusFailsForInactiveUser) {
// Verifies a single tree is used for multiple displays.
TEST_F(DisplayTest, MultipleDisplays) {
- window_server_delegate()->set_num_displays_to_create(2);
+ window_server_delegate()->CreateDisplays(2);
WindowManagerWindowTreeFactorySetTestApi(
window_server()->window_manager_window_tree_factory_set())
.Add(kTestId1);
@@ -349,7 +349,7 @@ class ServerWindowDestructionObserver : public ServerWindowObserver {
// Assertions around destroying a secondary display.
TEST_F(DisplayTest, DestroyingDisplayDoesntDelete) {
- window_server_delegate()->set_num_displays_to_create(2);
+ window_server_delegate()->CreateDisplays(2);
WindowManagerWindowTreeFactorySetTestApi(
window_server()->window_manager_window_tree_factory_set())
.Add(kTestId1);
« no previous file with comments | « services/ui/ws/cursor_unittest.cc ('k') | services/ui/ws/test_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698