Return primary display if out of bounds point or NULL ponter is passed to gfx::Screen::GeDisplayNea

ash/display/display_controller_unittest.cc

 // Copyright (c) 2012 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 "ash/display/display_controller.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
@@ skipping 190 matching lines @@
   EXPECT_NE(primary_display.id(), secondary_display.id());
   aura::RootWindow* primary_root =
       display_controller->GetRootWindowForDisplayId(primary_display.id());
   aura::RootWindow* secondary_root =
       display_controller->GetRootWindowForDisplayId(secondary_display.id());
   EXPECT_NE(primary_root, secondary_root);
   aura::Window* launcher_window =
       Shell::GetInstance()->launcher()->widget()->GetNativeView();
   EXPECT_TRUE(primary_root->Contains(launcher_window));
   EXPECT_FALSE(secondary_root->Contains(launcher_window));
+  EXPECT_EQ(primary_display.id(),
+            gfx::Screen::GetDisplayNearestPoint(gfx::Point(-100, -100)).id());
+  EXPECT_EQ(primary_display.id(),
+            gfx::Screen::GetDisplayNearestWindow(NULL).id());
 
   // Switch primary and secondary
   display_controller->SetPrimaryDisplay(secondary_display);
   EXPECT_EQ(secondary_display.id(), gfx::Screen::GetPrimaryDisplay().id());
   EXPECT_EQ(primary_display.id(), ScreenAsh::GetSecondaryDisplay().id());
+  EXPECT_EQ(secondary_display.id(),
+            gfx::Screen::GetDisplayNearestPoint(gfx::Point(-100, -100)).id());
+  EXPECT_EQ(secondary_display.id(),
+            gfx::Screen::GetDisplayNearestWindow(NULL).id());
 
   EXPECT_EQ(
       primary_root,
       display_controller->GetRootWindowForDisplayId(secondary_display.id()));
   EXPECT_EQ(
       secondary_root,
       display_controller->GetRootWindowForDisplayId(primary_display.id()));
   EXPECT_TRUE(primary_root->Contains(launcher_window));
   EXPECT_FALSE(secondary_root->Contains(launcher_window));
 
   const DisplayLayout& inverted_layout =
       display_controller->GetLayoutForDisplay(primary_display);
 
   EXPECT_EQ("left, -50", inverted_layout.ToString());
 
   aura::WindowTracker tracker;
   tracker.Add(primary_root);
   tracker.Add(secondary_root);
 
   // Deleting 2nd display should move the primary to original primary display.
   UpdateDisplay("200x200");
   RunAllPendingInMessageLoop();  // RootWindow is deleted in a posted task.
   EXPECT_EQ(1, gfx::Screen::GetNumDisplays());
   EXPECT_EQ(primary_display.id(), gfx::Screen::GetPrimaryDisplay().id());
+  EXPECT_EQ(primary_display.id(),
+            gfx::Screen::GetDisplayNearestPoint(gfx::Point(-100, -100)).id());
+  EXPECT_EQ(primary_display.id(),
+            gfx::Screen::GetDisplayNearestWindow(NULL).id());
   EXPECT_TRUE(tracker.Contains(primary_root));
   EXPECT_FALSE(tracker.Contains(secondary_root));
   EXPECT_TRUE(primary_root->Contains(launcher_window));
 }
 
 TEST_F(DisplayControllerTest, MAYBE_UpdateDisplayWithHostOrigin) {
   UpdateDisplay("100x200,300x400");
   ASSERT_EQ(2, gfx::Screen::GetNumDisplays());
   Shell::RootWindowList root_windows =
       Shell::GetInstance()->GetAllRootWindows();
@@ skipping 21 matching lines @@
   UpdateDisplay("100+200-100x200,300+500-200x300");
   ASSERT_EQ(2, gfx::Screen::GetNumDisplays());
   EXPECT_EQ("100,200", root_windows[0]->GetHostOrigin().ToString());
   EXPECT_EQ("100x200", root_windows[0]->GetHostSize().ToString());
   EXPECT_EQ("300,500", root_windows[1]->GetHostOrigin().ToString());
   EXPECT_EQ("200x300", root_windows[1]->GetHostSize().ToString());
 }
 
 }  // namespace test
 }  // namespace ash