Remove "upgrading to 2x DSF for lower UI scale when 2x resoruces are available" option

ash/wm/ash_native_cursor_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/wm/ash_native_cursor_manager.h"
 
 #include "ash/display/display_info.h"
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
@@ skipping 147 matching lines @@
 #endif
 
 TEST_F(AshNativeCursorManagerTest, UIScaleShouldNotChangeCursor) {
   int64 display_id = Shell::GetScreen()->GetPrimaryDisplay().id();
   gfx::Display::SetInternalDisplayId(display_id);
 
   ::wm::CursorManager* cursor_manager = Shell::GetInstance()->cursor_manager();
   CursorManagerTestApi test_api(cursor_manager);
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
 
-  DisplayInfo::SetAllowUpgradeToHighDPI(false);
   display_manager->SetDisplayUIScale(display_id, 0.5f);
   EXPECT_EQ(1.0f,
             Shell::GetScreen()->GetPrimaryDisplay().device_scale_factor());
   EXPECT_EQ(1.0f, test_api.GetCurrentCursor().device_scale_factor());
 
   display_manager->SetDisplayUIScale(display_id, 1.0f);
 
-  DisplayInfo::SetAllowUpgradeToHighDPI(true);
-  // 1x display should keep using 1x cursor even if the DSF is upgraded to 2x.
-  display_manager->SetDisplayUIScale(display_id, 0.5f);
-  EXPECT_EQ(2.0f,
-            Shell::GetScreen()->GetPrimaryDisplay().device_scale_factor());
-  EXPECT_EQ(1.0f, test_api.GetCurrentCursor().device_scale_factor());
-
   // 2x display should keep using 2x cursor regardless of the UI scale.
   UpdateDisplay("800x800*2");
   EXPECT_EQ(2.0f,
             Shell::GetScreen()->GetPrimaryDisplay().device_scale_factor());
   EXPECT_EQ(2.0f, test_api.GetCurrentCursor().device_scale_factor());
   display_manager->SetDisplayUIScale(display_id, 2.0f);
   EXPECT_EQ(1.0f,
             Shell::GetScreen()->GetPrimaryDisplay().device_scale_factor());
   EXPECT_EQ(2.0f, test_api.GetCurrentCursor().device_scale_factor());
 }
@@ skipping 16 matching lines @@
   loader.set_scale(2.0f);
   loader.LoadImageCursor(kCursorId, IDR_AURA_CURSOR_MOVE, gfx::Point());
   image = loader.GetXcursorImageForTest(kCursorId);
   EXPECT_EQ(height * 2, static_cast<int>(image->height));
   EXPECT_EQ(width * 2, static_cast<int>(image->width));
 }
 #endif
 
 }  // namespace test
 }  // namespace ash