Updates display manager and display preferences to handle touch calibration 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 150 matching lines @@
   }};
 
   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 (size_t i = 0; i < expected_data.point_pairs.size(); i++) {
-    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);
-  }
+  EXPECT_EQ(expected_data, info.GetTouchCalibrationData());
 
   // Clear all touch calibration data for the display.
   info.clear_touch_calibration_data();
 
   EXPECT_FALSE(info.has_touch_calibration_data());
 }
 
 }  // namespace display