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

Unified Diff: ash/extended_desktop_unittest.cc

Issue 2713923002: chromeos: moves a bunch of tests to common_unittests (Closed)
Patch Set: feedback Created 3 years, 10 months 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 | « ash/common/wallpaper/wallpaper_controller_unittest.cc ('k') | ash/mus/bridge/wm_shell_mus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/extended_desktop_unittest.cc
diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc
index 8747c721070012c61da6e4e5bba716ef35ce8f68..8dc73cbabb8bc3dc38076fc7f9f57a8c78da2868 100644
--- a/ash/extended_desktop_unittest.cc
+++ b/ash/extended_desktop_unittest.cc
@@ -751,16 +751,14 @@ TEST_F(ExtendedDesktopTest, StayInSameRootWindow) {
kShellWindowId_SettingBubbleContainer);
aura::Window* window =
aura::test::CreateTestWindowWithId(100, settings_bubble_container);
- window->SetBoundsInScreen(gfx::Rect(150, 10, 50, 50),
- display_manager()->GetSecondaryDisplay());
+ window->SetBoundsInScreen(gfx::Rect(150, 10, 50, 50), GetSecondaryDisplay());
EXPECT_EQ(root_windows[0], window->GetRootWindow());
aura::Window* status_container =
Shell::GetPrimaryRootWindowController()->GetContainer(
kShellWindowId_StatusContainer);
window = aura::test::CreateTestWindowWithId(100, status_container);
- window->SetBoundsInScreen(gfx::Rect(150, 10, 50, 50),
- display_manager()->GetSecondaryDisplay());
+ window->SetBoundsInScreen(gfx::Rect(150, 10, 50, 50), GetSecondaryDisplay());
EXPECT_EQ(root_windows[0], window->GetRootWindow());
}
@@ -773,8 +771,7 @@ TEST_F(ExtendedDesktopTest, KeyEventsOnLockScreen) {
display::Screen::GetScreen()->GetPrimaryDisplay().bounds());
widget1->Show();
EXPECT_EQ(root_windows[0], widget1->GetNativeView()->GetRootWindow());
- views::Widget* widget2 =
- CreateTestWidget(display_manager()->GetSecondaryDisplay().bounds());
+ views::Widget* widget2 = CreateTestWidget(GetSecondaryDisplay().bounds());
widget2->Show();
EXPECT_EQ(root_windows[1], widget2->GetNativeView()->GetRootWindow());
« no previous file with comments | « ash/common/wallpaper/wallpaper_controller_unittest.cc ('k') | ash/mus/bridge/wm_shell_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698