Moves FindDisplayIndexContainingPoint into display

ash/display/unified_mouse_warp_controller_unittest.cc

 // Copyright 2015 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/unified_mouse_warp_controller.h"
 
 #include "ash/display/display_util.h"
 #include "ash/display/mirror_window_controller.h"
 #include "ash/display/mouse_cursor_event_filter.h"
 #include "ash/host/ash_window_tree_host.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/display/display.h"
+#include "ui/display/display_finder.h"
 #include "ui/display/manager/display_manager.h"
-#include "ui/display/manager/display_manager_utilities.h"
 #include "ui/display/screen.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/wm/core/coordinate_conversion.h"
 
 namespace ash {
 
 class UnifiedMouseWarpControllerTest : public test::AshTestBase {
  public:
   UnifiedMouseWarpControllerTest() {}
   ~UnifiedMouseWarpControllerTest() override {}
@@ skipping 53 matching lines @@
 #else
     GetEventGenerator().MoveMouseToWithNative(point_in_unified_host,
                                               point_in_native);
 #endif
     aura::Window* root = Shell::GetPrimaryRootWindow();
     gfx::Point new_location_in_unified_host =
         aura::Env::GetInstance()->last_mouse_location();
     // Convert screen to the host.
     root->GetHost()->ConvertDIPToPixels(&new_location_in_unified_host);
 
-    int new_index = display::FindDisplayIndexContainingPoint(
+    auto iter = display::FindDisplayContainingPoint(
         display_manager()->software_mirroring_display_list(),
         new_location_in_unified_host);
-    if (new_index < 0)
+    if (iter == display_manager()->software_mirroring_display_list().end())
       return false;
-    return orig_mirroring_display_id !=
-           display_manager()->software_mirroring_display_list()[new_index].id();
+    return orig_mirroring_display_id != iter->id();
   }
 
   MouseCursorEventFilter* event_filter() {
     return Shell::GetInstance()->mouse_cursor_filter();
   }
 
   UnifiedMouseWarpController* mouse_warp_controller() {
     return static_cast<UnifiedMouseWarpController*>(
         event_filter()->mouse_warp_controller_for_test());
   }
@@ skipping 139 matching lines @@
   EXPECT_TRUE(TestIfMouseWarpsAt(gfx::Point(600, 10)));
   EXPECT_EQ("249,5",  // moved to 498 by 2px, divided by 2 (dsf).
             aura::Env::GetInstance()->last_mouse_location().ToString());
   {
     SCOPED_TRACE("1x2 NO WARP");
     NoWarpTestBody();
   }
 }
 
 }  // namespace aura