Move TouchTransformerController to ui/display/.

ash/touch/touch_transformer_controller_unittest.cc

Index: ash/touch/touch_transformer_controller_unittest.cc
diff --git a/ash/touch/touch_transformer_controller_unittest.cc b/ash/touch/touch_transformer_controller_unittest.cc
deleted file mode 100644
index 0b6b9a3703f73f4f41cfa57127f196880dfe79eb..0000000000000000000000000000000000000000
--- a/ash/touch/touch_transformer_controller_unittest.cc
+++ /dev/null
@@ -1,828 +0,0 @@
-// 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 "ash/touch/touch_transformer_controller.h"
-
-#include "ash/shell.h"
-#include "ash/test/ash_test_base.h"
-#include "base/rand_util.h"
-#include "base/strings/string_number_conversions.h"
-#include "ui/aura/window_tree_host.h"
-#include "ui/events/devices/device_data_manager.h"
-
-namespace ash {
-
-namespace {
-
-constexpr int kDisplayId1 = 1;
-constexpr int kTouchId1 = 5;
-
-display::ManagedDisplayInfo CreateDisplayInfo(int64_t id,
-                                              unsigned int touch_device_id,
-                                              const gfx::Rect& bounds) {
-  display::ManagedDisplayInfo info(id, std::string(), false);
-  info.SetBounds(bounds);
-  info.AddInputDevice(touch_device_id);
-
-  // Create a default mode.
-  display::ManagedDisplayInfo::ManagedDisplayModeList default_modes(
-      1, make_scoped_refptr(
-             new display::ManagedDisplayMode(bounds.size(), 60, false, true)));
-  info.SetManagedDisplayModes(default_modes);
-
-  return info;
-}
-
-ui::TouchscreenDevice CreateTouchscreenDevice(unsigned int id,
-                                              const gfx::Size& size) {
-  return ui::TouchscreenDevice(id, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL,
-                               std::string(), size, 0);
-}
-
-std::string GetTouchPointString(
-    const display::TouchCalibrationData::CalibrationPointPairQuad& pts) {
-  std::string str = "Failed for point pairs: ";
-  for (std::size_t row = 0; row < pts.size(); row++) {
-    str += "{(" + base::IntToString(pts[row].first.x()) + "," +
-           base::IntToString(pts[row].first.y()) + "), (" +
-           base::IntToString(pts[row].second.x()) + "," +
-           base::IntToString(pts[row].second.y()) + ")} ";
-  }
-  return str;
-}
-
-// Checks if the touch input has been calibrated properly. The input is said to
-// be calibrated if any touch input is transformed to the correct corresponding
-// display point within an error delta of |max_error_delta.width()| along the X
-// axis and |max_error_delta.height()| along the Y axis;
-void CheckPointsOfInterests(const int touch_id,
-                            const gfx::Size& touch_size,
-                            const gfx::Size& display_size,
-                            const gfx::Size& max_error_delta,
-                            const std::string& error_msg) {
-  ui::DeviceDataManager* device_manager = ui::DeviceDataManager::GetInstance();
-  float x, y;
-
-  // Origin of the touch device should correspond to origin of the display.
-  x = y = 0.0;
-  device_manager->ApplyTouchTransformer(touch_id, &x, &y);
-  EXPECT_NEAR(0, x, max_error_delta.width()) << error_msg;
-  EXPECT_NEAR(0, y, max_error_delta.height()) << error_msg;
-
-  // Center of the touch device should correspond to the center of the display
-  // device.
-  x = touch_size.width() / 2;
-  y = touch_size.height() / 2;
-  device_manager->ApplyTouchTransformer(touch_id, &x, &y);
-  EXPECT_NEAR(display_size.width() / 2, x, max_error_delta.width())
-      << error_msg;
-  EXPECT_NEAR(display_size.height() / 2, y, max_error_delta.height())
-      << error_msg;
-
-  // Bottom right corner of the touch device should correspond to rightmost
-  // corner of display device.
-  x = touch_size.width();
-  y = touch_size.height();
-  device_manager->ApplyTouchTransformer(touch_id, &x, &y);
-  EXPECT_NEAR(display_size.width(), x, max_error_delta.width()) << error_msg;
-  EXPECT_NEAR(display_size.height(), y, max_error_delta.height()) << error_msg;
-}
-
-}  //  namespace
-
-class TouchTransformerControllerTest : public test::AshTestBase {
- public:
-  TouchTransformerControllerTest() {}
-  ~TouchTransformerControllerTest() override {}
-
-  gfx::Transform GetTouchTransform(
-      const display::ManagedDisplayInfo& display,
-      const display::ManagedDisplayInfo& touch_display,
-      const ui::TouchscreenDevice& touchscreen,
-      const gfx::Size& framebuffer_size) const {
-    return Shell::GetInstance()
-        ->touch_transformer_controller()
-        ->GetTouchTransform(display, touch_display, touchscreen,
-                            framebuffer_size);
-  }
-
-  double GetTouchResolutionScale(
-      const display::ManagedDisplayInfo& touch_display,
-      const ui::TouchscreenDevice& touch_device) const {
-    return Shell::GetInstance()
-        ->touch_transformer_controller()
-        ->GetTouchResolutionScale(touch_display, touch_device);
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(TouchTransformerControllerTest);
-};
-
-TEST_F(TouchTransformerControllerTest, MirrorModeLetterboxing) {
-  // The internal display has native resolution of 2560x1700, and in
-  // mirror mode it is configured as 1920x1200. This is in letterboxing
-  // mode.
-  display::ManagedDisplayInfo internal_display_info =
-      CreateDisplayInfo(1, 10u, gfx::Rect(0, 0, 1920, 1200));
-  internal_display_info.set_is_aspect_preserving_scaling(true);
-
-  display::ManagedDisplayInfo::ManagedDisplayModeList internal_modes;
-
-  internal_modes.push_back(make_scoped_refptr(
-      new display::ManagedDisplayMode(gfx::Size(2560, 1700), 60, false, true)));
-  internal_modes.push_back(make_scoped_refptr(new display::ManagedDisplayMode(
-      gfx::Size(1920, 1200), 60, false, false)));
-  internal_display_info.SetManagedDisplayModes(internal_modes);
-
-  display::ManagedDisplayInfo external_display_info =
-      CreateDisplayInfo(2, 11u, gfx::Rect(0, 0, 1920, 1200));
-
-  gfx::Size fb_size(1920, 1200);
-
-  // Create the touchscreens with the same size as the framebuffer so we can
-  // share the tests between Ozone & X11.
-  ui::TouchscreenDevice internal_touchscreen =
-      CreateTouchscreenDevice(10, fb_size);
-  ui::TouchscreenDevice external_touchscreen =
-      CreateTouchscreenDevice(11, fb_size);
-
-  ui::DeviceDataManager* device_manager = ui::DeviceDataManager::GetInstance();
-
-  device_manager->UpdateTouchInfoForDisplay(
-      internal_display_info.id(), internal_touchscreen.id,
-      GetTouchTransform(internal_display_info, internal_display_info,
-                        internal_touchscreen, fb_size));
-
-  device_manager->UpdateTouchInfoForDisplay(
-      internal_display_info.id(), external_touchscreen.id,
-      GetTouchTransform(external_display_info, external_display_info,
-                        external_touchscreen, fb_size));
-
-  EXPECT_EQ(1, device_manager->GetTargetDisplayForTouchDevice(10));
-  EXPECT_EQ(1, device_manager->GetTargetDisplayForTouchDevice(11));
-
-  // External touch display has the default TouchTransformer.
-  float x = 100.0;
-  float y = 100.0;
-  device_manager->ApplyTouchTransformer(11, &x, &y);
-  EXPECT_EQ(100, x);
-  EXPECT_EQ(100, y);
-
-  // In letterboxing, there is (1-2560*(1200/1920)/1700)/2 = 2.95% of the
-  // height on both the top & bottom region of the screen is blank.
-  // When touch events coming at Y range [0, 1200), the mapping should be
-  // [0, ~35] ---> < 0
-  // [~35, ~1165] ---> [0, 1200)
-  // [~1165, 1200] ---> >= 1200
-  x = 100.0;
-  y = 35.0;
-  device_manager->ApplyTouchTransformer(10, &x, &y);
-  EXPECT_NEAR(100, x, 0.5);
-  EXPECT_NEAR(0, y, 0.5);
-
-  x = 100.0;
-  y = 1165.0;
-  device_manager->ApplyTouchTransformer(10, &x, &y);
-  EXPECT_NEAR(100, x, 0.5);
-  EXPECT_NEAR(1200, y, 0.5);
-}
-
-TEST_F(TouchTransformerControllerTest, MirrorModePillarboxing) {
-  // The internal display has native resolution of 1366x768, and in
-  // mirror mode it is configured as 1024x768. This is in pillarboxing
-  // mode.
-  display::ManagedDisplayInfo internal_display_info =
-      CreateDisplayInfo(1, 10, gfx::Rect(0, 0, 1024, 768));
-  internal_display_info.set_is_aspect_preserving_scaling(true);
-  display::ManagedDisplayInfo::ManagedDisplayModeList internal_modes;
-  internal_modes.push_back(make_scoped_refptr(
-      new display::ManagedDisplayMode(gfx::Size(1366, 768), 60, false, true)));
-  internal_modes.push_back(make_scoped_refptr(
-      new display::ManagedDisplayMode(gfx::Size(1024, 768), 60, false, false)));
-  internal_display_info.SetManagedDisplayModes(internal_modes);
-
-  display::ManagedDisplayInfo external_display_info =
-      CreateDisplayInfo(2, 11, gfx::Rect(0, 0, 1024, 768));
-
-  gfx::Size fb_size(1024, 768);
-
-  // Create the touchscreens with the same size as the framebuffer so we can
-  // share the tests between Ozone & X11.
-  ui::TouchscreenDevice internal_touchscreen =
-      CreateTouchscreenDevice(10, fb_size);
-  ui::TouchscreenDevice external_touchscreen =
-      CreateTouchscreenDevice(11, fb_size);
-
-  ui::DeviceDataManager* device_manager = ui::DeviceDataManager::GetInstance();
-
-  device_manager->UpdateTouchInfoForDisplay(
-      internal_display_info.id(), internal_touchscreen.id,
-      GetTouchTransform(internal_display_info, internal_display_info,
-                        internal_touchscreen, fb_size));
-
-  device_manager->UpdateTouchInfoForDisplay(
-      internal_display_info.id(), external_touchscreen.id,
-      GetTouchTransform(external_display_info, external_display_info,
-                        external_touchscreen, fb_size));
-
-  EXPECT_EQ(1, device_manager->GetTargetDisplayForTouchDevice(10));
-  EXPECT_EQ(1, device_manager->GetTargetDisplayForTouchDevice(11));
-
-  // External touch display has the default TouchTransformer.
-  float x = 100.0;
-  float y = 100.0;
-  device_manager->ApplyTouchTransformer(11, &x, &y);
-  EXPECT_EQ(100, x);
-  EXPECT_EQ(100, y);
-
-  // In pillarboxing, there is (1-768*(1024/768)/1366)/2 = 12.5% of the
-  // width on both the left & rigth region of the screen is blank.
-  // When touch events coming at X range [0, 1024), the mapping should be
-  // [0, ~128] ---> < 0
-  // [~128, ~896] ---> [0, 1024)
-  // [~896, 1024] ---> >= 1024
-  x = 128.0;
-  y = 100.0;
-  device_manager->ApplyTouchTransformer(10, &x, &y);
-  EXPECT_NEAR(0, x, 0.5);
-  EXPECT_NEAR(100, y, 0.5);
-
-  x = 896.0;
-  y = 100.0;
-  device_manager->ApplyTouchTransformer(10, &x, &y);
-  EXPECT_NEAR(1024, x, 0.5);
-  EXPECT_NEAR(100, y, 0.5);
-}
-
-TEST_F(TouchTransformerControllerTest, SoftwareMirrorMode) {
-  // External display 1 has size 1280x850. External display 2 has size
-  // 1920x1080. When using software mirroring to mirror display 1 onto
-  // display 2, the displays are in extended mode and we map touches from both
-  // displays to display 1.
-  // The total frame buffer is 1920x1990,
-  // where 1990 = 850 + 60 (hidden gap) + 1080 and the second monitor is
-  // translated to point (0, 950) in the framebuffer.
-  display::ManagedDisplayInfo display1_info =
-      CreateDisplayInfo(1, 10u, gfx::Rect(0, 0, 1280, 850));
-  display::ManagedDisplayInfo::ManagedDisplayModeList display1_modes;
-  display1_modes.push_back(make_scoped_refptr(
-      new display::ManagedDisplayMode(gfx::Size(1280, 850), 60, false, true)));
-  display1_info.SetManagedDisplayModes(display1_modes);
-
-  display::ManagedDisplayInfo display2_info =
-      CreateDisplayInfo(2, 11u, gfx::Rect(0, 950, 1920, 1080));
-  display::ManagedDisplayInfo::ManagedDisplayModeList display2_modes;
-  display2_modes.push_back(make_scoped_refptr(
-      new display::ManagedDisplayMode(gfx::Size(1920, 1080), 60, false, true)));
-  display2_info.SetManagedDisplayModes(display2_modes);
-
-  gfx::Size fb_size(1920, 1990);
-
-  // Create the touchscreens with the same size as the framebuffer so we can
-  // share the tests between Ozone & X11.
-  ui::TouchscreenDevice display1_touchscreen =
-      CreateTouchscreenDevice(10, fb_size);
-  ui::TouchscreenDevice display2_touchscreen =
-      CreateTouchscreenDevice(11, fb_size);
-
-  ui::DeviceDataManager* device_manager = ui::DeviceDataManager::GetInstance();
-
-  device_manager->UpdateTouchInfoForDisplay(
-      display1_info.id(), display1_touchscreen.id,
-      GetTouchTransform(display1_info, display1_info, display1_touchscreen,
-                        fb_size));
-
-  device_manager->UpdateTouchInfoForDisplay(
-      display1_info.id(), display2_touchscreen.id,
-      GetTouchTransform(display1_info, display2_info, display2_touchscreen,
-                        fb_size));
-
-  EXPECT_EQ(1, device_manager->GetTargetDisplayForTouchDevice(10));
-  EXPECT_EQ(1, device_manager->GetTargetDisplayForTouchDevice(11));
-
-  // Mapping for touch events from display 1's touchscreen:
-  // [0, 1920) x [0, 1990) -> [0, 1280) x [0, 850)
-  float x = 0.0;
-  float y = 0.0;
-  device_manager->ApplyTouchTransformer(10, &x, &y);
-  EXPECT_NEAR(0, x, 0.5);
-  EXPECT_NEAR(0, y, 0.5);
-
-  x = 1920.0;
-  y = 1990.0;
-  device_manager->ApplyTouchTransformer(10, &x, &y);
-  EXPECT_NEAR(1280, x, 0.5);
-  EXPECT_NEAR(850, y, 0.5);
-
-  // In pillarboxing, there is (1-1280*(1080/850)/1920)/2 = 7.65% of the
-  // width on both the left & right region of the screen is blank.
-  // Events come in the range [0, 1920) x [0, 1990).
-  //
-  // X mapping:
-  // [0, ~147] ---> < 0
-  // [~147, ~1773] ---> [0, 1280)
-  // [~1773, 1920] ---> >= 1280
-  // Y mapping:
-  // [0, 1990) -> [0, 1080)
-  x = 147.0;
-  y = 0.0;
-  device_manager->ApplyTouchTransformer(11, &x, &y);
-  EXPECT_NEAR(0, x, 0.5);
-  EXPECT_NEAR(0, y, 0.5);
-
-  x = 1773.0;
-  y = 1990.0;
-  device_manager->ApplyTouchTransformer(11, &x, &y);
-  EXPECT_NEAR(1280, x, 0.5);
-  EXPECT_NEAR(850, y, 0.5);
-}
-
-TEST_F(TouchTransformerControllerTest, ExtendedMode) {
-  // The internal display has size 1366 x 768. The external display has
-  // size 2560x1600. The total frame buffer is 2560x2428,
-  // where 2428 = 768 + 60 (hidden gap) + 1600
-  // and the second monitor is translated to Point (0, 828) in the
-  // framebuffer.
-  display::ManagedDisplayInfo display1 =
-      CreateDisplayInfo(1, 5u, gfx::Rect(0, 0, 1366, 768));
-  display::ManagedDisplayInfo display2 =
-      CreateDisplayInfo(2, 6u, gfx::Rect(0, 828, 2560, 1600));
-  gfx::Size fb_size(2560, 2428);
-
-  // Create the touchscreens with the same size as the framebuffer so we can
-  // share the tests between Ozone & X11.
-  ui::TouchscreenDevice touchscreen1 = CreateTouchscreenDevice(5, fb_size);
-  ui::TouchscreenDevice touchscreen2 = CreateTouchscreenDevice(6, fb_size);
-
-  ui::DeviceDataManager* device_manager = ui::DeviceDataManager::GetInstance();
-
-  device_manager->UpdateTouchInfoForDisplay(
-      display1.id(), touchscreen1.id,
-      GetTouchTransform(display1, display1, touchscreen1, fb_size));
-
-  device_manager->UpdateTouchInfoForDisplay(
-      display2.id(), touchscreen2.id,
-      GetTouchTransform(display2, display2, touchscreen2, fb_size));
-
-  EXPECT_EQ(1, device_manager->GetTargetDisplayForTouchDevice(5));
-  EXPECT_EQ(2, device_manager->GetTargetDisplayForTouchDevice(6));
-
-  // Mapping for touch events from internal touch display:
-  // [0, 2560) x [0, 2428) -> [0, 1366) x [0, 768)
-  float x = 0.0;
-  float y = 0.0;
-  device_manager->ApplyTouchTransformer(5, &x, &y);
-  EXPECT_NEAR(0, x, 0.5);
-  EXPECT_NEAR(0, y, 0.5);
-
-  x = 2559.0;
-  y = 2427.0;
-  device_manager->ApplyTouchTransformer(5, &x, &y);
-  EXPECT_NEAR(1365, x, 0.5);
-  EXPECT_NEAR(768, y, 0.5);
-
-  // Mapping for touch events from external touch display:
-  // [0, 2560) x [0, 2428) -> [0, 2560) x [0, 1600)
-  x = 0.0;
-  y = 0.0;
-  device_manager->ApplyTouchTransformer(6, &x, &y);
-#if defined(USE_OZONE)
-  // On ozone we expect screen coordinates so add display origin.
-  EXPECT_NEAR(0 + 0, x, 0.5);
-  EXPECT_NEAR(0 + 828, y, 0.5);
-#else
-  EXPECT_NEAR(0, x, 0.5);
-  EXPECT_NEAR(0, y, 0.5);
-#endif
-
-  x = 2559.0;
-  y = 2427.0;
-  device_manager->ApplyTouchTransformer(6, &x, &y);
-#if defined(USE_OZONE)
-  // On ozone we expect screen coordinates so add display origin.
-  EXPECT_NEAR(2559 + 0, x, 0.5);
-  EXPECT_NEAR(1599 + 828, y, 0.5);
-#else
-  EXPECT_NEAR(2559, x, 0.5);
-  EXPECT_NEAR(1599, y, 0.5);
-#endif
-}
-
-TEST_F(TouchTransformerControllerTest, TouchRadiusScale) {
-  display::ManagedDisplayInfo display =
-      CreateDisplayInfo(1, 5u, gfx::Rect(0, 0, 2560, 1600));
-  ui::TouchscreenDevice touch_device =
-      CreateTouchscreenDevice(5, gfx::Size(1001, 1001));
-
-  // Default touchscreen position range is 1001x1001;
-  EXPECT_EQ(sqrt((2560.0 * 1600.0) / (1001.0 * 1001.0)),
-            GetTouchResolutionScale(display, touch_device));
-}
-
-TEST_F(TouchTransformerControllerTest, OzoneTranslation) {
-#if defined(USE_OZONE)
-  // The internal display has size 1920 x 1200. The external display has
-  // size 1920x1200. The total frame buffer is 1920x2450,
-  // where 2458 = 1200 + 50 (hidden gap) + 1200
-  // and the second monitor is translated to Point (0, 1250) in the
-  // framebuffer.
-  const int kDisplayId2 = 2;
-  const int kTouchId2 = 6;
-  const gfx::Size kDisplaySize(1920, 1200);
-  const gfx::Size kTouchSize(1920, 1200);
-  const int kHiddenGap = 50;
-
-  display::ManagedDisplayInfo display1 = CreateDisplayInfo(
-      kDisplayId1, kTouchId1,
-      gfx::Rect(0, 0, kDisplaySize.width(), kDisplaySize.height()));
-  display::ManagedDisplayInfo display2 =
-      CreateDisplayInfo(kDisplayId2, kTouchId2,
-                        gfx::Rect(0, kDisplaySize.height() + kHiddenGap,
-                                  kDisplaySize.width(), kDisplaySize.height()));
-
-  gfx::Size fb_size(1920, 2450);
-
-  ui::TouchscreenDevice touchscreen1 =
-      CreateTouchscreenDevice(kTouchId1, kDisplaySize);
-  ui::TouchscreenDevice touchscreen2 =
-      CreateTouchscreenDevice(kTouchId2, kDisplaySize);
-
-  ui::DeviceDataManager* device_manager = ui::DeviceDataManager::GetInstance();
-
-  // Mirror displays. Touch screen 2 is associated to display 1.
-  device_manager->UpdateTouchInfoForDisplay(
-      display1.id(), touchscreen1.id,
-      GetTouchTransform(display1, display1, touchscreen1, kTouchSize));
-
-  device_manager->UpdateTouchInfoForDisplay(
-      display1.id(), touchscreen2.id,
-      GetTouchTransform(display1, display2, touchscreen2, kTouchSize));
-
-  EXPECT_EQ(kDisplayId1,
-            device_manager->GetTargetDisplayForTouchDevice(kTouchId1));
-  EXPECT_EQ(kDisplayId1,
-            device_manager->GetTargetDisplayForTouchDevice(kTouchId2));
-
-  float x, y;
-
-  x = y = 0.0;
-  device_manager->ApplyTouchTransformer(kTouchId1, &x, &y);
-  EXPECT_NEAR(0, x, 0.5);
-  EXPECT_NEAR(0, y, 0.5);
-
-  x = y = 0.0;
-  device_manager->ApplyTouchTransformer(kTouchId2, &x, &y);
-  EXPECT_NEAR(0, x, 0.5);
-  EXPECT_NEAR(0, y, 0.5);
-
-  x = 1920.0;
-  y = 1200.0;
-  device_manager->ApplyTouchTransformer(kTouchId1, &x, &y);
-  EXPECT_NEAR(1920, x, 0.5);
-  EXPECT_NEAR(1200, y, 0.5);
-
-  x = 1920.0;
-  y = 1200.0;
-  device_manager->ApplyTouchTransformer(kTouchId2, &x, &y);
-  EXPECT_NEAR(1920, x, 0.5);
-  EXPECT_NEAR(1200, y, 0.5);
-
-  // Remove mirroring of displays.
-  device_manager->UpdateTouchInfoForDisplay(
-      display2.id(), touchscreen2.id,
-      GetTouchTransform(display2, display2, touchscreen2, kTouchSize));
-
-  x = 1920.0;
-  y = 1200.0;
-  device_manager->ApplyTouchTransformer(kTouchId1, &x, &y);
-  EXPECT_NEAR(1920, x, 0.5);
-  EXPECT_NEAR(1200, y, 0.5);
-
-  x = 1920.0;
-  y = 1200.0;
-  device_manager->ApplyTouchTransformer(kTouchId2, &x, &y);
-  EXPECT_NEAR(1920, x, 0.5);
-  EXPECT_NEAR(1200 + kDisplaySize.height() + kHiddenGap, y, 0.5);
-#endif  // USE_OZONE
-}
-
-TEST_F(TouchTransformerControllerTest, AccurateUserTouchCalibration) {
-  const gfx::Size kDisplaySize(1920, 1200);
-  const gfx::Size kTouchSize(1920, 1200);
-
-  display::ManagedDisplayInfo display = CreateDisplayInfo(
-      kDisplayId1, kTouchId1,
-      gfx::Rect(0, 0, kDisplaySize.width(), kDisplaySize.height()));
-
-  // Assuming the user provided accurate inputs during calibration. ie the user
-  // actually tapped (100,100) when asked to tap (100,100) with no human error.
-  display::TouchCalibrationData::CalibrationPointPairQuad user_input = {{
-      std::make_pair(gfx::Point(100, 100), gfx::Point(100, 100)),
-      std::make_pair(gfx::Point(1820, 100), gfx::Point(1820, 100)),
-      std::make_pair(gfx::Point(100, 1100), gfx::Point(100, 1100)),
-      std::make_pair(gfx::Point(1820, 1100), gfx::Point(1820, 1100)),
-  }};
-  display::TouchCalibrationData touch_data(user_input, kDisplaySize);
-  display.SetTouchCalibrationData(touch_data);
-  EXPECT_TRUE(display.has_touch_calibration_data());
-
-  const std::string msg = GetTouchPointString(user_input);
-
-  gfx::Size fb_size(1920, 1200);
-
-  ui::TouchscreenDevice touchscreen =
-      CreateTouchscreenDevice(kTouchId1, kTouchSize);
-
-  ui::DeviceDataManager* device_manager = ui::DeviceDataManager::GetInstance();
-
-  device_manager->UpdateTouchInfoForDisplay(
-      display.id(), touchscreen.id,
-      GetTouchTransform(display, display, touchscreen, kTouchSize));
-
-  EXPECT_EQ(kDisplayId1,
-            device_manager->GetTargetDisplayForTouchDevice(kTouchId1));
-
-  CheckPointsOfInterests(kTouchId1, kTouchSize, kDisplaySize, gfx::Size(1, 1),
-                         msg);
-}
-
-TEST_F(TouchTransformerControllerTest, ErrorProneUserTouchCalibration) {
-  const gfx::Size kDisplaySize(1920, 1200);
-  const gfx::Size kTouchSize(1920, 1200);
-  // User touch inputs have a max error of 5%.
-  const float kError = 0.05;
-  // The maximum user error rate is |kError|%. Since the calibration is
-  // performed with a best fit algorithm, the error rate observed should be less
-  // than |kError|.
-  const gfx::Size kMaxErrorDelta = gfx::ScaleToCeiledSize(kTouchSize, kError);
-
-  display::ManagedDisplayInfo display = CreateDisplayInfo(
-      kDisplayId1, kTouchId1,
-      gfx::Rect(0, 0, kDisplaySize.width(), kDisplaySize.height()));
-
-  // Assuming the user provided inaccurate inputs during calibration. ie the
-  // user did not tap (100,100) when asked to tap (100,100) due to human error.
-  display::TouchCalibrationData::CalibrationPointPairQuad user_input = {
-      {std::make_pair(gfx::Point(100, 100), gfx::Point(130, 60)),
-       std::make_pair(gfx::Point(1820, 100), gfx::Point(1878, 130)),
-       std::make_pair(gfx::Point(100, 1100), gfx::Point(158, 1060)),
-       std::make_pair(gfx::Point(1820, 1100), gfx::Point(1790, 1140))}};
-  display::TouchCalibrationData touch_data(user_input, kDisplaySize);
-  display.SetTouchCalibrationData(touch_data);
-  EXPECT_TRUE(display.has_touch_calibration_data());
-
-  const std::string msg = GetTouchPointString(user_input);
-
-  ui::TouchscreenDevice touchscreen =
-      CreateTouchscreenDevice(kTouchId1, kTouchSize);
-
-  ui::DeviceDataManager* device_manager = ui::DeviceDataManager::GetInstance();
-
-  device_manager->UpdateTouchInfoForDisplay(
-      display.id(), touchscreen.id,
-      GetTouchTransform(display, display, touchscreen, kTouchSize));
-
-  EXPECT_EQ(kDisplayId1,
-            device_manager->GetTargetDisplayForTouchDevice(kTouchId1));
-
-  CheckPointsOfInterests(kTouchId1, kTouchSize, kDisplaySize, kMaxErrorDelta,
-                         msg);
-}
-
-TEST_F(TouchTransformerControllerTest, ResolutionChangeUserTouchCalibration) {
-  const gfx::Size kDisplaySize(2560, 1600);
-  const gfx::Size kTouchSize(1920, 1200);
-  // User touch inputs have a max error of 5%.
-  const float kError = 0.05;
-  // The maximum user error rate is |kError|%. Since the calibration is
-  // performed with a best fit algorithm, the error rate observed should be less
-  // tha |kError|.
-  gfx::Size kMaxErrorDelta = gfx::ScaleToCeiledSize(kDisplaySize, kError);
-
-  display::ManagedDisplayInfo display = CreateDisplayInfo(
-      kDisplayId1, kTouchId1,
-      gfx::Rect(0, 0, kDisplaySize.width(), kDisplaySize.height()));
-
-  // The calibration was performed at a resolution different from the curent
-  // resolution of the display.
-  const gfx::Size CALIBRATION_SIZE(1920, 1200);
-  display::TouchCalibrationData::CalibrationPointPairQuad user_input = {
-      {std::make_pair(gfx::Point(100, 100), gfx::Point(50, 70)),
-       std::make_pair(gfx::Point(1820, 100), gfx::Point(1780, 70)),
-       std::make_pair(gfx::Point(100, 1100), gfx::Point(70, 1060)),
-       std::make_pair(gfx::Point(1820, 1100), gfx::Point(1770, 1140))}};
-
-  display::TouchCalibrationData touch_data(user_input, CALIBRATION_SIZE);
-  display.SetTouchCalibrationData(touch_data);
-  EXPECT_TRUE(display.has_touch_calibration_data());
-
-  const std::string msg = GetTouchPointString(user_input);
-
-  ui::TouchscreenDevice touchscreen =
-      CreateTouchscreenDevice(kTouchId1, kTouchSize);
-
-  ui::DeviceDataManager* device_manager = ui::DeviceDataManager::GetInstance();
-
-  device_manager->UpdateTouchInfoForDisplay(
-      display.id(), touchscreen.id,
-      GetTouchTransform(display, display, touchscreen, kTouchSize));
-
-  EXPECT_EQ(kDisplayId1,
-            device_manager->GetTargetDisplayForTouchDevice(kTouchId1));
-
-  CheckPointsOfInterests(kTouchId1, kTouchSize, kDisplaySize, kMaxErrorDelta,
-                         msg);
-}
-
-TEST_F(TouchTransformerControllerTest, DifferentBoundsUserTouchCalibration) {
-  // The display bounds is different from the touch device bounds in this test.
-  const gfx::Size kDisplaySize(1024, 600);
-  const gfx::Size kTouchSize(4096, 4096);
-  const float kAcceptableError = 0.04;
-  gfx::Size kMaxErrorDelta =
-      gfx::ScaleToCeiledSize(kDisplaySize, kAcceptableError);
-
-  display::ManagedDisplayInfo display = CreateDisplayInfo(
-      kDisplayId1, kTouchId1,
-      gfx::Rect(0, 0, kDisplaySize.width(), kDisplaySize.height()));
-
-  // Real world data.
-  display::TouchCalibrationData::CalibrationPointPairQuad user_input = {
-      {std::make_pair(gfx::Point(136, 136), gfx::Point(538, 931)),
-       std::make_pair(gfx::Point(873, 136), gfx::Point(3475, 922)),
-       std::make_pair(gfx::Point(136, 411), gfx::Point(611, 2800)),
-       std::make_pair(gfx::Point(873, 411), gfx::Point(3535, 2949))}};
-  display::TouchCalibrationData touch_data(user_input, kDisplaySize);
-  display.SetTouchCalibrationData(touch_data);
-  EXPECT_TRUE(display.has_touch_calibration_data());
-
-  const std::string msg = GetTouchPointString(user_input);
-
-  ui::TouchscreenDevice touchscreen =
-      CreateTouchscreenDevice(kTouchId1, kTouchSize);
-
-  ui::DeviceDataManager* device_manager = ui::DeviceDataManager::GetInstance();
-
-  device_manager->UpdateTouchInfoForDisplay(
-      display.id(), touchscreen.id,
-      GetTouchTransform(display, display, touchscreen, kTouchSize));
-
-  EXPECT_EQ(kDisplayId1,
-            device_manager->GetTargetDisplayForTouchDevice(kTouchId1));
-
-  CheckPointsOfInterests(kTouchId1, kTouchSize, kDisplaySize, kMaxErrorDelta,
-                         msg);
-}
-
-TEST_F(TouchTransformerControllerTest, LetterboxingUserTouchCalibration) {
-  // The internal display has native resolution of 2560x1700, and in
-  // mirror mode it is configured as 1920x1200. This is in letterboxing
-  // mode.
-  const gfx::Size kNativeDisplaySize(2560, 1700);
-  const gfx::Size kDisplaySize(1920, 1200);
-  const gfx::Size kTouchSize(1920, 1200);
-
-  display::ManagedDisplayInfo internal_display_info = CreateDisplayInfo(
-      kDisplayId1, kTouchId1,
-      gfx::Rect(0, 0, kDisplaySize.width(), kDisplaySize.height()));
-  internal_display_info.set_is_aspect_preserving_scaling(true);
-
-  display::ManagedDisplayInfo::ManagedDisplayModeList internal_modes;
-
-  internal_modes.push_back(make_scoped_refptr(new display::ManagedDisplayMode(
-      gfx::Size(kNativeDisplaySize.width(), kNativeDisplaySize.height()), 60,
-      false, true)));
-  internal_modes.push_back(make_scoped_refptr(new display::ManagedDisplayMode(
-      gfx::Size(kDisplaySize.width(), kDisplaySize.height()), 60, false,
-      false)));
-  internal_display_info.SetManagedDisplayModes(internal_modes);
-
-  gfx::Size fb_size(kDisplaySize);
-
-  // Create the touchscreens with the same size as the framebuffer so we can
-  // share the tests between Ozone & X11.
-  ui::TouchscreenDevice internal_touchscreen =
-      CreateTouchscreenDevice(kTouchId1, fb_size);
-
-  ui::DeviceDataManager* device_manager = ui::DeviceDataManager::GetInstance();
-
-  // Assuming the user provided inaccurate inputs during calibration. ie the
-  // user did not tap (100,100) when asked to tap (100,100) due to human error.
-  // Since the display is of size 2560x1700 and the touch device is of size
-  // 1920x1200, the corresponding points have to be scaled.
-  display::TouchCalibrationData::CalibrationPointPairQuad user_input = {{
-      std::make_pair(gfx::Point(100, 100), gfx::Point(75, 71)),
-      std::make_pair(gfx::Point(2460, 100), gfx::Point(1845, 71)),
-      std::make_pair(gfx::Point(100, 1600), gfx::Point(75, 1130)),
-      std::make_pair(gfx::Point(2460, 1600), gfx::Point(1845, 1130)),
-  }};
-  // The calibration was performed at the native display resolution.
-  display::TouchCalibrationData touch_data(user_input, kNativeDisplaySize);
-  internal_display_info.SetTouchCalibrationData(touch_data);
-  EXPECT_TRUE(internal_display_info.has_touch_calibration_data());
-
-  device_manager->UpdateTouchInfoForDisplay(
-      internal_display_info.id(), internal_touchscreen.id,
-      GetTouchTransform(internal_display_info, internal_display_info,
-                        internal_touchscreen, fb_size));
-
-  EXPECT_EQ(kDisplayId1,
-            device_manager->GetTargetDisplayForTouchDevice(kTouchId1));
-
-  float x, y;
-  // In letterboxing, there is (1-2560*(1200/1920)/1700)/2 = 2.95% of the
-  // height on both the top & bottom region of the screen is blank.
-  // When touch events coming at Y range [0, 1200), the mapping should be
-  // [0, ~35] ---> < 0
-  // [~35, ~1165] ---> [0, 1200)
-  // [~1165, 1200] ---> >= 1200
-  x = 100.0;
-  y = 35.0;
-  device_manager->ApplyTouchTransformer(kTouchId1, &x, &y);
-  EXPECT_NEAR(100, x, 0.5);
-  EXPECT_NEAR(0, y, 0.5);
-
-  x = 100.0;
-  y = 1165.0;
-  device_manager->ApplyTouchTransformer(kTouchId1, &x, &y);
-  EXPECT_NEAR(100, x, 0.5);
-  EXPECT_NEAR(1200, y, 0.5);
-}
-
-TEST_F(TouchTransformerControllerTest, PillarBoxingUserTouchCalibration) {
-  // The internal display has native resolution of 2560x1700, and in
-  // mirror mode it is configured as 1920x1200. This is in letterboxing
-  // mode.
-  const gfx::Size kNativeDisplaySize(2560, 1600);
-  const gfx::Size kDisplaySize(1920, 1400);
-  const gfx::Size kTouchSize(1920, 1400);
-
-  display::ManagedDisplayInfo internal_display_info = CreateDisplayInfo(
-      kDisplayId1, kTouchId1,
-      gfx::Rect(0, 0, kDisplaySize.width(), kDisplaySize.height()));
-  internal_display_info.set_is_aspect_preserving_scaling(true);
-
-  display::ManagedDisplayInfo::ManagedDisplayModeList internal_modes;
-
-  internal_modes.push_back(make_scoped_refptr(new display::ManagedDisplayMode(
-      gfx::Size(kNativeDisplaySize.width(), kNativeDisplaySize.height()), 60,
-      false, true)));
-  internal_modes.push_back(make_scoped_refptr(new display::ManagedDisplayMode(
-      gfx::Size(kDisplaySize.width(), kDisplaySize.height()), 60, false,
-      false)));
-  internal_display_info.SetManagedDisplayModes(internal_modes);
-
-  gfx::Size fb_size(kDisplaySize);
-
-  // Create the touchscreens with the same size as the framebuffer so we can
-  // share the tests between Ozone & X11.
-  ui::TouchscreenDevice internal_touchscreen =
-      CreateTouchscreenDevice(kTouchId1, fb_size);
-
-  ui::DeviceDataManager* device_manager = ui::DeviceDataManager::GetInstance();
-
-  // Assuming the user provided accurate inputs during calibration. ie the user
-  // actually tapped (100,100) when asked to tap (100,100) with no human error.
-  // Since the display is of size 2560x1600 and the touch device is of size
-  // 1920x1400, the corresponding points have to be scaled.
-  display::TouchCalibrationData::CalibrationPointPairQuad user_input = {{
-      std::make_pair(gfx::Point(100, 100), gfx::Point(75, 88)),
-      std::make_pair(gfx::Point(2460, 100), gfx::Point(1845, 88)),
-      std::make_pair(gfx::Point(100, 1500), gfx::Point(75, 1313)),
-      std::make_pair(gfx::Point(2460, 1500), gfx::Point(1845, 1313)),
-  }};
-  // The calibration was performed at the native display resolution.
-  display::TouchCalibrationData touch_data(user_input, kNativeDisplaySize);
-  internal_display_info.SetTouchCalibrationData(touch_data);
-  EXPECT_TRUE(internal_display_info.has_touch_calibration_data());
-
-  device_manager->UpdateTouchInfoForDisplay(
-      internal_display_info.id(), internal_touchscreen.id,
-      GetTouchTransform(internal_display_info, internal_display_info,
-                        internal_touchscreen, fb_size));
-
-  EXPECT_EQ(kDisplayId1,
-            device_manager->GetTargetDisplayForTouchDevice(kTouchId1));
-
-  float x, y;
-  // In pillarboxing, there is (1-1600*(1920/1400)/2560)/2 = 7.14% of the
-  // width on both the left & region region of the screen is blank.
-  // When touch events coming at X range [0, 1920), the mapping should be
-  // [0, ~137] ---> < 0
-  // [~137, ~1782] ---> [0, 1920)
-  // [~1782, 1920] ---> >= 1920
-  x = 137.0;
-  y = 0.0;
-  device_manager->ApplyTouchTransformer(kTouchId1, &x, &y);
-  EXPECT_NEAR(0, x, 0.5);
-  EXPECT_NEAR(0, y, 0.5);
-
-  x = 1782.0;
-  y = 0.0;
-  device_manager->ApplyTouchTransformer(kTouchId1, &x, &y);
-  EXPECT_NEAR(1920, x, 0.5);
-  EXPECT_NEAR(0, y, 0.5);
-}
-
-}  // namespace ash