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

extensions/browser/api/system_display/display_info_provider.h

Index: extensions/browser/api/system_display/display_info_provider.h
diff --git a/extensions/browser/api/system_display/display_info_provider.h b/extensions/browser/api/system_display/display_info_provider.h
index 3ab6357b726e4da0e7990a1f5d82db6e9551e9f5..1340dd5ce451211cebe25a667d2c8086506f1367 100644
--- a/extensions/browser/api/system_display/display_info_provider.h
+++ b/extensions/browser/api/system_display/display_info_provider.h
@@ -75,14 +75,16 @@ class DisplayInfoProvider {
 
   // Implements touch calibration methods. See system_display.idl. This returns
   // false if |id| is invalid.
-  virtual bool TouchCalibrationStart(const std::string& id);
-  virtual bool TouchCalibrationSet(
-      const std::string& id,
+  virtual bool StartNativeTouchCalibration(const std::string& id,
+                                           std::string* error);
+  virtual bool StartCustomTouchCalibration(const std::string& id,
+                                           std::string* error);
+  virtual bool CompleteCustomTouchCalibration(
       const api::system_display::TouchCalibrationPairQuad& pairs,
       const api::system_display::Bounds& bounds,
       std::string* error);
-  virtual bool TouchCalibrationReset(const std::string& id, std::string* error);
-  virtual bool IsTouchCalibrationActive(std::string* error);
+  virtual bool ResetTouchCalibration(const std::string& id, std::string* error);
+  virtual bool IsNativeTouchCalibrationActive(std::string* error);
 
  protected:
   DisplayInfoProvider();