Updates display manager and display preferences to handle touch calibration data.

chrome/browser/chromeos/display/display_preferences.h

Index: chrome/browser/chromeos/display/display_preferences.h
diff --git a/chrome/browser/chromeos/display/display_preferences.h b/chrome/browser/chromeos/display/display_preferences.h
index 7580677878276b7f8af530225f0045727707d1fd..d48d51e54bda15a84b59f79afbe1aea7479c53ce 100644
--- a/chrome/browser/chromeos/display/display_preferences.h
+++ b/chrome/browser/chromeos/display/display_preferences.h
@@ -6,12 +6,17 @@
 #define CHROME_BROWSER_CHROMEOS_DISPLAY_DISPLAY_PREFERENCES_H_
 
 #include <stdint.h>
+#include <array>
 
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/display/manager/display_layout.h"
 
 class PrefRegistrySimple;
 
+namespace gfx {
+class Point;
+}
+
 namespace chromeos {
 
 // Registers the prefs associated with display settings and stored
@@ -38,6 +43,13 @@ void StoreDisplayLayoutPrefForTest(const display::DisplayIdList& list,
 // Stores the given |power_state| for tests.
 void StoreDisplayPowerStateForTest(DisplayPowerState power_state);
 
+// Parses the marshalled string data stored in local preferences for calibration
+// points and populates |point_pair_quad| using the unmarshalled data.
+// See TouchCalibrationData in Managed display info.
+bool ParseTouchCalibrationStringForTest(
+    const std::string& str,
+    std::array<std::pair<gfx::Point, gfx::Point>, 4>* point_pair_quad);
+
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_DISPLAY_DISPLAY_PREFERENCES_H_