Introduce user customization of external HighDPI mode for 4K monitor.

ash/display/resolution_notification_controller_unittest.cc

 // Copyright 2013 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/resolution_notification_controller.h"
 
 #include "ash/display/display_manager.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
@@ skipping 46 matching lines @@
   virtual void SetUp() OVERRIDE {
     ash::test::AshTestBase::SetUp();
     ResolutionNotificationController::SuppressTimerForTest();
   }
 
   void SetDisplayResolutionAndNotifyWithResolution(
       const gfx::Display& display,
       const gfx::Size& new_resolution,
       const gfx::Size& actual_new_resolution) {
     DisplayManager* display_manager = Shell::GetInstance()->display_manager();
+
     const DisplayInfo& info = display_manager->GetDisplayInfo(display.id());
-    controller()->SetDisplayResolutionAndNotify(
-        display.id(),
-        info.size_in_pixel(),
-        new_resolution,
-        base::Bind(&ResolutionNotificationControllerTest::OnAccepted,
-                   base::Unretained(this)));
+    DisplayMode old_mode(info.size_in_pixel(),
+                         60 /* refresh_rate */,
+                         false /* interlaced */,
+                         false /* native */);
+    DisplayMode new_mode = old_mode;
+    new_mode.size = new_resolution;
+
+    if (display_manager->SetDisplayMode(display.id(), new_mode)) {
+      controller()->PrepareNotification(
+          display.id(),
+          old_mode,
+          new_mode,
+          base::Bind(&ResolutionNotificationControllerTest::OnAccepted,
+                     base::Unretained(this)));
+    }
 
     // OnConfigurationChanged event won't be emitted in the test environment,
     // so invoke UpdateDisplay() to emit that event explicitly.
     std::vector<DisplayInfo> info_list;
     for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i) {
       int64 id = display_manager->GetDisplayAt(i).id();
       DisplayInfo info = display_manager->GetDisplayInfo(id);
       if (display.id() == id) {
         gfx::Rect bounds = info.bounds_in_native();
         bounds.set_size(actual_new_resolution);
@@ skipping 320 matching lines @@
   ClickOnNotificationButton(0);
   RunAllPendingInMessageLoop();
   EXPECT_FALSE(IsNotificationVisible());
   EXPECT_EQ(0, accept_count());
   EXPECT_TRUE(display_manager->GetSelectedModeForDisplayId(id2, &mode));
   EXPECT_EQ("250x250", mode.size.ToString());
   EXPECT_EQ(58.0f, mode.refresh_rate);
 }
 
 }  // namespace ash