chromeos: Choose monitor native mode as best match mode

ui/display/chromeos/display_configurator_unittest.cc

 // Copyright 2014 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 "ui/display/chromeos/display_configurator.h"
 
 #include <stdint.h>
 
 #include <cmath>
 #include <cstdarg>
@@ skipping 418 matching lines @@
   TestDisplaySnapshot outputs_[2];
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DisplayConfiguratorTest);
 };
 
 }  // namespace
 
 TEST_F(DisplayConfiguratorTest, FindDisplayModeMatchingSize) {
   ScopedVector<const DisplayMode> modes;
+  DisplayMode *native_mode;

[Daniel Erat, 2014/10/22 17:04:03]

nit: please initialize this when it's declared, e.g.

  DisplayMode* native mode =
      new DisplayMode(gfx::Size(1920, 1200), false, 50.0);
  modes.push_back(native_mode);

(also note that the '*' goes to the left of the space)

 
   // Fields are width, height, interlaced, refresh rate.
   modes.push_back(new DisplayMode(gfx::Size(1920, 1200), false, 60.0));
+  native_mode = new DisplayMode(gfx::Size(1920, 1200), false, 50.0);
+  modes.push_back(native_mode);
   // Different rates.
   modes.push_back(new DisplayMode(gfx::Size(1920, 1080), false, 30.0));
   modes.push_back(new DisplayMode(gfx::Size(1920, 1080), false, 50.0));
   modes.push_back(new DisplayMode(gfx::Size(1920, 1080), false, 40.0));
   modes.push_back(new DisplayMode(gfx::Size(1920, 1080), false, 0.0));
   // Interlaced vs non-interlaced.
   modes.push_back(new DisplayMode(gfx::Size(1280, 720), true, 60.0));
   modes.push_back(new DisplayMode(gfx::Size(1280, 720), false, 40.0));
   // Interlaced only.
   modes.push_back(new DisplayMode(gfx::Size(1024, 768), true, 0.0));
   modes.push_back(new DisplayMode(gfx::Size(1024, 768), true, 40.0));
   modes.push_back(new DisplayMode(gfx::Size(1024, 768), true, 60.0));
   // Mixed.
   modes.push_back(new DisplayMode(gfx::Size(1024, 600), true, 60.0));
   modes.push_back(new DisplayMode(gfx::Size(1024, 600), false, 40.0));
   modes.push_back(new DisplayMode(gfx::Size(1024, 600), false, 50.0));
   // Just one interlaced mode.
   modes.push_back(new DisplayMode(gfx::Size(640, 480), true, 60.0));
   // Refresh rate not available.
   modes.push_back(new DisplayMode(gfx::Size(320, 200), false, 0.0));
 
   TestDisplaySnapshot output;
   output.set_modes(modes.get());
+  output.set_native_mode(native_mode);
 
-  EXPECT_EQ(modes[0],
+  // Should pick native over highest refresh rate.
+  EXPECT_EQ(modes[1],
             DisplayConfigurator::FindDisplayModeMatchingSize(
                 output, gfx::Size(1920, 1200)));
 
   // Should pick highest refresh rate.
-  EXPECT_EQ(modes[2],
+  EXPECT_EQ(modes[3],
             DisplayConfigurator::FindDisplayModeMatchingSize(
                 output, gfx::Size(1920, 1080)));
 
   // Should pick non-interlaced mode.
-  EXPECT_EQ(modes[6],
+  EXPECT_EQ(modes[7],
             DisplayConfigurator::FindDisplayModeMatchingSize(
                 output, gfx::Size(1280, 720)));
 
   // Interlaced only. Should pick one with the highest refresh rate in
   // interlaced mode.
-  EXPECT_EQ(modes[9],
+  EXPECT_EQ(modes[10],
             DisplayConfigurator::FindDisplayModeMatchingSize(
                 output, gfx::Size(1024, 768)));
 
   // Mixed: Should pick one with the highest refresh rate in
   // interlaced mode.
-  EXPECT_EQ(modes[12],
+  EXPECT_EQ(modes[13],
             DisplayConfigurator::FindDisplayModeMatchingSize(
                 output, gfx::Size(1024, 600)));
 
   // Just one interlaced mode.
-  EXPECT_EQ(modes[13],
+  EXPECT_EQ(modes[14],
             DisplayConfigurator::FindDisplayModeMatchingSize(
                 output, gfx::Size(640, 480)));
 
   // Refresh rate not available.
-  EXPECT_EQ(modes[14],
+  EXPECT_EQ(modes[15],
             DisplayConfigurator::FindDisplayModeMatchingSize(
                 output, gfx::Size(320, 200)));
 
   // No mode found.
   EXPECT_EQ(NULL,
             DisplayConfigurator::FindDisplayModeMatchingSize(
                 output, gfx::Size(1440, 900)));
 }
 
 TEST_F(DisplayConfiguratorTest, ConnectSecondOutput) {
@@ skipping 886 matching lines @@
               .c_str(),
           GetCrtcAction(outputs_[0], &small_mode_, gfx::Point(0, 0)).c_str(),
           GetCrtcAction(outputs_[1], &small_mode_, gfx::Point(0, 0)).c_str(),
           kForceDPMS,
           kUngrab,
           NULL),
       log_->GetActionsAndClear());
 }
 
 }  // namespace ui