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

chrome/browser/extensions/display_info_provider_chromeos.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_DISPLAY_INFO_PROVIDER_CHROMEOS_H_
 #define CHROME_BROWSER_EXTENSIONS_DISPLAY_INFO_PROVIDER_CHROMEOS_H_
 
 #include <map>
 #include <memory>
 
@@ skipping 22 matching lines @@
       api::system_display::DisplayUnitInfo* unit) override;
   void EnableUnifiedDesktop(bool enable) override;
   DisplayUnitInfoList GetAllDisplaysInfo() override;
   DisplayLayoutList GetDisplayLayout() override;
   bool OverscanCalibrationStart(const std::string& id) override;
   bool OverscanCalibrationAdjust(
       const std::string& id,
       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();
 
   chromeos::OverscanCalibrator* GetOverscanCalibrator(const std::string& id);
 
   std::map<std::string, std::unique_ptr<chromeos::OverscanCalibrator>>
       overscan_calibrators_;
 
   std::unique_ptr<chromeos::TouchCalibratorController> touch_calibrator_;
 
+  std::string touch_calibration_target_id_;
+  bool custom_touch_calibration_active_ = false;
+
   DISALLOW_COPY_AND_ASSIGN(DisplayInfoProviderChromeOS);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_DISPLAY_INFO_PROVIDER_CHROMEOS_H_