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

chrome/browser/extensions/display_info_provider_chromeos.h

Index: chrome/browser/extensions/display_info_provider_chromeos.h
diff --git a/chrome/browser/extensions/display_info_provider_chromeos.h b/chrome/browser/extensions/display_info_provider_chromeos.h
index 85caebc8a34ca7a2d30d0f04be0782c40361f756..861e282a5b97a255809abe0a11cc6e2ebc827c77 100644
--- a/chrome/browser/extensions/display_info_provider_chromeos.h
+++ b/chrome/browser/extensions/display_info_provider_chromeos.h
@@ -40,14 +40,18 @@ class DisplayInfoProviderChromeOS : public DisplayInfoProvider {
       const api::system_display::Insets& delta) override;
   bool OverscanCalibrationReset(const std::string& id) override;
   bool OverscanCalibrationComplete(const std::string& id) override;
-  bool TouchCalibrationSet(
-      const std::string& id,
+  bool ShowNativeTouchCalibration(
+      const std::string& id, std::string* error,
+      const TouchCalibrationCallback& callback) override;
+  bool StartCustomTouchCalibration(const std::string& id,
+                                   std::string* error) override;
+  bool CompleteCustomTouchCalibration(
       const api::system_display::TouchCalibrationPairQuad& pairs,
       const api::system_display::Bounds& bounds,
       std::string* error) override;
-  bool TouchCalibrationReset(const std::string& id,
+  bool ResetTouchCalibration(const std::string& id,
                              std::string* error) override;
-  bool IsTouchCalibrationActive(std::string* error) override;
+  bool IsNativeTouchCalibrationActive(std::string* error) override;
 
  private:
   chromeos::TouchCalibratorController* GetTouchCalibrator();
@@ -59,6 +63,9 @@ class DisplayInfoProviderChromeOS : public DisplayInfoProvider {
 
   std::unique_ptr<chromeos::TouchCalibratorController> touch_calibrator_;
 
+  std::string touch_calibration_target_id_;
+  bool custom_touch_calibration_active_ = false;
+
   DISALLOW_COPY_AND_ASSIGN(DisplayInfoProviderChromeOS);
 };