Relocate reuseable portions of ash/display/display_util.*

ash/display/display_manager_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_manager.h"
 
 #include "ash/accelerators/accelerator_commands_aura.h"
 #include "ash/common/ash_switches.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/wm/window_state.h"
@@ skipping 15 matching lines @@
 #include "grit/ash_strings.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_observer.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/display/display.h"
 #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"
 #include "ui/gfx/font_render_params.h"
 
 namespace ash {
 
 using std::vector;
 using std::string;
 
@@ skipping 2081 matching lines @@
   EXPECT_EQ(internal_id, internal_display_id);
 
   display_info_list.clear();
   display_info_list.push_back(external_display_info);
   display_manager()->OnNativeDisplaysChanged(display_info_list);
   EXPECT_EQ(1U, display_manager()->active_display_list().size());
 
   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.
 TEST_P(DisplayManagerTest, DontRegisterBadConfig) {
   if (!SupportsMultipleDisplays())
     return;
   display::DisplayIdList list = ash::test::CreateDisplayIdList2(1, 2);
   display::DisplayLayoutBuilder builder(1);
   builder.AddDisplayPlacement(2, 1, display::DisplayPlacement::LEFT, 0);
   builder.AddDisplayPlacement(3, 1, display::DisplayPlacement::BOTTOM, 0);
@@ skipping 170 matching lines @@
   EXPECT_EQ(display::Display::ROTATE_90,
             info.GetRotation(display::Display::ROTATION_SOURCE_USER));
   EXPECT_EQ(display::Display::ROTATE_90,
             info.GetRotation(display::Display::ROTATION_SOURCE_ACTIVE));
 }
 
 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());
 
   display::DisplayIdList good_list = test::CreateDisplayIdList2(id1, id2);
   layout_store->RegisterLayoutForDisplayIdList(good_list, good->Copy());
 
   display::DisplayLayoutBuilder bad(id1);
   bad.SetSecondaryPlacement(id2, display::DisplayPlacement::BOTTOM, 0);
 
@@ skipping 21 matching lines @@
   const display::DisplayLayout& stored =
       layout_store->GetRegisteredDisplayLayout(list);
 
   EXPECT_EQ(id1, stored.placement_list[0].parent_display_id);
   EXPECT_EQ(id2, stored.placement_list[0].display_id);
 }
 
 #endif  // OS_CHROMEOS
 
 }  // namespace ash