Relocate reuseable portions of ash/display/display_util.*

ash/display/display_manager_unittest.cc

Index: ash/display/display_manager_unittest.cc
diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc
index bbc61ec0d82370bdaaf5085bbbff9d07a03cec97..ddd138aa7350acb04c12aab1307e92a358c9f83d 100644
--- a/ash/display/display_manager_unittest.cc
+++ b/ash/display/display_manager_unittest.cc
@@ -33,6 +33,7 @@
 #include "ui/display/display_observer.h"
 #include "ui/display/manager/display_layout_builder.h"
 #include "ui/display/manager/display_layout_store.h"
+#include "ui/display/manager/display_manager_utilities.h"
 #include "ui/display/manager/managed_display_info.h"
 #include "ui/display/screen.h"
 #include "ui/events/test/event_generator.h"
@@ -2134,17 +2135,9 @@ TEST_P(DisplayManagerTest, DockMode) {
   EXPECT_TRUE(display_manager()->IsActiveDisplayId(external_id));
   EXPECT_FALSE(display_manager()->IsActiveDisplayId(internal_id));
 
-  const ui::ManagedDisplayInfo& info =
-      display_manager()->GetDisplayInfo(internal_id);
-
-  EXPECT_FALSE(!!GetDisplayModeForNextUIScale(info, true));
-  EXPECT_FALSE(!!GetDisplayModeForNextUIScale(info, false));
+  EXPECT_FALSE(display_manager()->ZoomInternalDisplay(true));
+  EXPECT_FALSE(display_manager()->ZoomInternalDisplay(false));
   EXPECT_FALSE(SetDisplayUIScale(internal_id, 1.0f));
-
-  ui::ManagedDisplayInfo invalid_info;
-  EXPECT_FALSE(!!GetDisplayModeForNextUIScale(invalid_info, true));
-  EXPECT_FALSE(!!GetDisplayModeForNextUIScale(invalid_info, false));
-  EXPECT_FALSE(SetDisplayUIScale(display::Display::kInvalidDisplayID, 1.0f));
 }
 
 // Make sure that bad layout information is ignored and does not crash.
@@ -2335,7 +2328,7 @@ TEST_P(DisplayManagerTest, RejectInvalidLayoutData) {
   display::DisplayLayoutStore* layout_store = display_manager()->layout_store();
   int64_t id1 = 10001;
   int64_t id2 = 10002;
-  ASSERT_TRUE(CompareDisplayIds(id1, id2));
+  ASSERT_TRUE(ui::CompareDisplayIds(id1, id2));
   display::DisplayLayoutBuilder good_builder(id1);
   good_builder.SetSecondaryPlacement(id2, display::DisplayPlacement::LEFT, 0);
   std::unique_ptr<display::DisplayLayout> good(good_builder.Build());