Prepare ManagedDisplayInfo to store touch calibration associated data

ui/display/manager/managed_display_info_unittest.cc

 // Copyright (c) 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 "ui/display/manager/managed_display_info.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace display {
 namespace {
@@ skipping 129 matching lines @@
   EXPECT_EQ(11, info.input_devices()[1]);
 
   ManagedDisplayInfo copy_info =
       ManagedDisplayInfo::CreateFromSpecWithID("200x100", 10);
   copy_info.Copy(info);
   EXPECT_EQ(2u, copy_info.input_devices().size());
   copy_info.ClearInputDevices();
   EXPECT_EQ(0u, copy_info.input_devices().size());
 }
 
+TEST_F(DisplayInfoTest, TouchCalibrationTest) {
+  ManagedDisplayInfo info =
+      ManagedDisplayInfo::CreateFromSpecWithID("200x100", 10);
+
+  EXPECT_FALSE(info.has_touch_calibration_data());
+
+  TouchCalibrationData::CalibrationPointPairQuad points;
+
+  points[0] = std::make_pair(gfx::Point(10, 10), gfx::Point(11, 12));
+  points[1] = std::make_pair(gfx::Point(190, 10), gfx::Point(195, 8));
+  points[2] = std::make_pair(gfx::Point(10, 90), gfx::Point(12, 94));
+  points[3] = std::make_pair(gfx::Point(190, 90), gfx::Point(189, 88));

[oshima, 2016/11/24 00:36:40]

nit: i believe you can also do
points = {
  std::make_pair,
  std::make_par,
  ...
  ..
};

up to you though.

+
+  gfx::Size size(200, 100);
+
+  TouchCalibrationData expected_data(points, size);
+
+  // Add touch data for the display.
+  info.SetTouchCalibrationData(expected_data);
+
+  EXPECT_TRUE(info.has_touch_calibration_data());
+  TouchCalibrationData actual_data = info.GetTouchCalibrationData();
+  EXPECT_EQ(actual_data.bounds, size);
+  for (int i = 0; i < 4; i++) {

[oshima, 2016/11/24 00:36:40]

can you use the arraysize instead of 4?

+    EXPECT_EQ(actual_data.point_pairs[i].first,
+              expected_data.point_pairs[i].first);
+
+    EXPECT_EQ(actual_data.point_pairs[i].second,
+              expected_data.point_pairs[i].second);
+  }
+
+  // Clear all touch calibration data for the display.
+  info.clear_touch_calibration_data();
+
+  EXPECT_FALSE(info.has_touch_calibration_data());
+}
+
 }  // namespace display