Updates touch calibration API and plumbs through the native touch calibration method

chrome/browser/extensions/display_info_provider_chromeos_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 "extensions/browser/api/system_display/display_info_provider.h"
 
 #include <stdint.h>
 
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm_shell.h"
@@ skipping 1178 matching lines @@
   bool success = false;
   std::string error;
   CallSetDisplayUnitInfo(base::Int64ToString(id), info, &success, &error);
   ASSERT_TRUE(success);
 
   // Verify that other_mode now matches the active mode.
   active_mode = GetDisplayManager()->GetActiveModeForDisplayId(id);
   EXPECT_TRUE(active_mode->IsEquivalent(other_mode_ash));
 }
 
-TEST_F(DisplayInfoProviderChromeosTest, SetTouchCalibrationInternal) {
+TEST_F(DisplayInfoProviderChromeosTest, CustomTouchCalibrationInternal) {
   UpdateDisplay("1200x600,600x1000*2");
   const int64_t internal_display_id =
       display::test::DisplayManagerTestApi(
           ash::Shell::GetInstance()->display_manager())
           .SetFirstDisplayAsInternalDisplay();
 
   std::string id = base::Int64ToString(internal_display_id);
 
-  api::system_display::TouchCalibrationPairQuad pairs;
-  api::system_display::Bounds bounds;
-
-  bool success = false;
   std::string error;
   std::string expected_err =
       "Display Id(" + id + ") is an internal display." +
       " Internal displays cannot be calibrated for touch.";
-
-  success = DisplayInfoProvider::Get()->TouchCalibrationSet(id, pairs, bounds,
-                                                            &error);
+  bool success = DisplayInfoProvider::Get()->StartCustomTouchCalibration(
+      id, &error);
 
   ASSERT_FALSE(success);
   EXPECT_EQ(expected_err, error);
 }
 
-TEST_F(DisplayInfoProviderChromeosTest, SetTouchCalibrationNonTouchDisplay) {
+TEST_F(DisplayInfoProviderChromeosTest, CustomTouchCalibrationWithoutStart) {
+  UpdateDisplay("1200x600,600x1000*2");
+
+  api::system_display::TouchCalibrationPairQuad pairs;
+  api::system_display::Bounds bounds;
+
+  std::string error;
+  std::string expected_err =
+      "Please call system.display.startCustomTouchCalibration before calling "
+      "this method.";

[stevenjb, 2017/01/19 17:19:01]

This string should be made public and declared in the header so it can be used
here. Then if someone changes the string the unit test won't fail unexpectedly.

[malaykeshav, 2017/01/19 23:49:07]

Done

+  bool success = DisplayInfoProvider::Get()->CompleteCustomTouchCalibration(
+      pairs, bounds, &error);
+
+  ASSERT_FALSE(success);
+  EXPECT_EQ(expected_err, error);
+}
+
+
+TEST_F(DisplayInfoProviderChromeosTest, CustomTouchCalibrationNonTouchDisplay) {
   UpdateDisplay("1200x600,600x1000*2");
 
   const int64_t internal_display_id =
       display::test::DisplayManagerTestApi(
           ash::Shell::GetInstance()->display_manager())
           .SetFirstDisplayAsInternalDisplay();
 
   display::DisplayIdList display_id_list =
       display_manager()->GetCurrentDisplayIdList();
 
   // Pick the non internal display Id.
   const int64_t display_id = display_id_list[0] == internal_display_id
                                  ? display_id_list[1]
                                  : display_id_list[0];
 
   display::test::DisplayManagerTestApi(
       ash::Shell::GetInstance()->display_manager())
       .SetTouchSupport(display_id, display::Display::TOUCH_SUPPORT_UNAVAILABLE);
 
   std::string id = base::Int64ToString(display_id);
 
-  api::system_display::TouchCalibrationPairQuad pairs;
-  api::system_display::Bounds bounds;
-
-  bool success = false;
   std::string error;
   std::string expected_err = "Display Id(" + id + ") does not support touch.";
 
-  success = DisplayInfoProvider::Get()->TouchCalibrationSet(id, pairs, bounds,
-                                                            &error);
+  bool success = DisplayInfoProvider::Get()->StartCustomTouchCalibration(
+      id, &error);
 
   ASSERT_FALSE(success);
   EXPECT_EQ(expected_err, error);
 }
 
-TEST_F(DisplayInfoProviderChromeosTest, SetTouchCalibrationNegativeBounds) {
+TEST_F(DisplayInfoProviderChromeosTest, CustomTouchCalibrationNegativeBounds) {
   UpdateDisplay("1200x600,600x1000*2");
 
   const int64_t internal_display_id =
       display::test::DisplayManagerTestApi(display_manager())
           .SetFirstDisplayAsInternalDisplay();
 
   display::DisplayIdList display_id_list =
       display_manager()->GetCurrentDisplayIdList();
 
   // Pick the non internal display Id.
   const int64_t display_id = display_id_list[0] == internal_display_id
                                  ? display_id_list[1]
                                  : display_id_list[0];
 
   display::test::DisplayManagerTestApi(display_manager())
       .SetTouchSupport(display_id, display::Display::TOUCH_SUPPORT_AVAILABLE);
 
   std::string id = base::Int64ToString(display_id);
 
   api::system_display::TouchCalibrationPairQuad pairs;
   api::system_display::Bounds bounds;
   bounds.width = -1;
 
-  bool success = false;
   std::string error;
-  success = DisplayInfoProvider::Get()->TouchCalibrationSet(id, pairs, bounds,
-                                                            &error);
+  DisplayInfoProvider::Get()->StartCustomTouchCalibration(id, &error);
+  error = "";

[stevenjb, 2017/01/19 17:19:01]

nit: error.clear()

[malaykeshav, 2017/01/19 23:49:07]

Done

+  bool success = DisplayInfoProvider::Get()->CompleteCustomTouchCalibration(
+      pairs, bounds, &error);
 
   std::string expected_err = "Bounds cannot have negative values.";
 
   ASSERT_FALSE(success);
   EXPECT_EQ(expected_err, error);
 
   error.clear();
   bounds.width = 0;
   bounds.height = -1;
 
-  success = DisplayInfoProvider::Get()->TouchCalibrationSet(id, pairs, bounds,
-                                                            &error);
+  DisplayInfoProvider::Get()->StartCustomTouchCalibration(id, &error);
+  error = "";
+  success = DisplayInfoProvider::Get()->CompleteCustomTouchCalibration(
+      pairs, bounds, &error);
   ASSERT_FALSE(success);
   EXPECT_EQ(expected_err, error);
 }
 
-TEST_F(DisplayInfoProviderChromeosTest, SetTouchCalibrationInvalidPoints) {
+TEST_F(DisplayInfoProviderChromeosTest, CustomTouchCalibrationInvalidPoints) {
   UpdateDisplay("1200x600,600x1000*2");
 
   const int64_t internal_display_id =
       display::test::DisplayManagerTestApi(display_manager())
           .SetFirstDisplayAsInternalDisplay();
 
   display::DisplayIdList display_id_list =
       display_manager()->GetCurrentDisplayIdList();
 
   // Pick the non internal display Id.
   const int64_t display_id = display_id_list[0] == internal_display_id
                                  ? display_id_list[1]
                                  : display_id_list[0];
 
   display::test::DisplayManagerTestApi(display_manager())
       .SetTouchSupport(display_id, display::Display::TOUCH_SUPPORT_AVAILABLE);
 
   std::string id = base::Int64ToString(display_id);
 
   api::system_display::TouchCalibrationPairQuad pairs;
   api::system_display::Bounds bounds;
 
   pairs.pair1.display_point.x = -1;
-  bool success = false;
   std::string error;
-  success = DisplayInfoProvider::Get()->TouchCalibrationSet(id, pairs, bounds,
-                                                            &error);
+  DisplayInfoProvider::Get()->StartCustomTouchCalibration(id, &error);
+  error = "";
+  bool success = DisplayInfoProvider::Get()->CompleteCustomTouchCalibration(
+      pairs, bounds, &error);
 
   std::string expected_err = "Display points and touch points cannot have "
                              "negative coordinates";
 
   ASSERT_FALSE(success);
   EXPECT_EQ(expected_err, error);
 
   error.clear();
   bounds.width = 1;
   pairs.pair1.display_point.x = 2;
   expected_err = "Display point coordinates cannot be more than size of the "
                  "display.";
 
-  success = DisplayInfoProvider::Get()->TouchCalibrationSet(id, pairs, bounds,
-                                                            &error);
+  DisplayInfoProvider::Get()->StartCustomTouchCalibration(id, &error);
+  error = "";
+  success = DisplayInfoProvider::Get()->CompleteCustomTouchCalibration(
+      pairs, bounds, &error);
   ASSERT_FALSE(success);
   EXPECT_EQ(expected_err, error);
 }
 
-TEST_F(DisplayInfoProviderChromeosTest, SetTouchCalibrationSuccess) {
+TEST_F(DisplayInfoProviderChromeosTest, CustomTouchCalibrationSuccess) {
   UpdateDisplay("1200x600,600x1000*2");
 
   const int64_t internal_display_id =
       display::test::DisplayManagerTestApi(display_manager())
           .SetFirstDisplayAsInternalDisplay();
 
   display::DisplayIdList display_id_list =
       display_manager()->GetCurrentDisplayIdList();
 
   // Pick the non internal display Id.
@@ skipping 23 matching lines @@
   pairs.pair2.touch_point.x = 22;
   pairs.pair2.touch_point.y = 23;
   pairs.pair3.touch_point.x = 24;
   pairs.pair3.touch_point.y = 25;
   pairs.pair4.touch_point.x = 26;
   pairs.pair4.touch_point.y = 27;
 
   bounds.width = 600;
   bounds.height = 1000;
 
-  bool success = false;
   std::string error;
-  success = DisplayInfoProvider::Get()->TouchCalibrationSet(id, pairs, bounds,
-                                                            &error);
+  DisplayInfoProvider::Get()->StartCustomTouchCalibration(id, &error);
+  error = "";
+  bool success = DisplayInfoProvider::Get()->CompleteCustomTouchCalibration(
+      pairs, bounds, &error);
 
   ASSERT_TRUE(success);
   EXPECT_EQ(error, "");
 
   const display::ManagedDisplayInfo& info =
       display_manager()->GetDisplayInfo(display_id);
 
   ASSERT_TRUE(info.has_touch_calibration_data());
   const display::TouchCalibrationData& data = info.GetTouchCalibrationData();
 
@@ skipping 15 matching lines @@
   EXPECT_EQ(pairs.pair1.touch_point.y, data.point_pairs[0].second.y());
   EXPECT_EQ(pairs.pair2.touch_point.y, data.point_pairs[1].second.y());
   EXPECT_EQ(pairs.pair3.touch_point.y, data.point_pairs[2].second.y());
   EXPECT_EQ(pairs.pair4.touch_point.y, data.point_pairs[3].second.y());
 
   EXPECT_EQ(bounds.width, data.bounds.width());
   EXPECT_EQ(bounds.height, data.bounds.height());
 }
 }  // namespace
 }  // namespace extensions