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

extensions/browser/api/system_display/display_info_provider.cc

 // Copyright 2013 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 "base/strings/string_number_conversions.h"
 #include "extensions/common/api/system_display.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
@@ skipping 102 matching lines @@
 }
 
 bool DisplayInfoProvider::OverscanCalibrationReset(const std::string& id) {
   return false;
 }
 
 bool DisplayInfoProvider::OverscanCalibrationComplete(const std::string& id) {
   return false;
 }
 
-bool DisplayInfoProvider::TouchCalibrationStart(const std::string& id) {
+bool DisplayInfoProvider::ShowNativeTouchCalibration(
+    const std::string& id,
+    std::string* error,
+    const TouchCalibrationCallback& callback) {
   NOTREACHED();  // Implemented on Chrome OS only in override.
   return false;
 }
 
-bool DisplayInfoProvider::TouchCalibrationSet(
-    const std::string& id,
+bool DisplayInfoProvider::StartCustomTouchCalibration(const std::string& id,
+                                                      std::string* error) {
+  NOTREACHED();  // Implemented on Chrome OS only in override.
+  return false;
+}
+
+bool DisplayInfoProvider::CompleteCustomTouchCalibration(
     const api::system_display::TouchCalibrationPairQuad& pairs,
     const api::system_display::Bounds& bounds,
     std::string* error) {
   NOTREACHED();  // Implemented on Chrome OS only in override.
   return false;
 }
 
-bool DisplayInfoProvider::TouchCalibrationReset(const std::string& id,
+bool DisplayInfoProvider::ClearTouchCalibration(const std::string& id,
                                                 std::string* error) {
   NOTREACHED();  // Implemented on Chrome OS only in override.
   return false;
 }
 
-bool DisplayInfoProvider::IsTouchCalibrationActive(std::string* error) {
+bool DisplayInfoProvider::IsNativeTouchCalibrationActive(std::string* error) {
   NOTREACHED();  // Implemented on Chrome OS only in override.
   return true;
 }
 
 DisplayInfoProvider::DisplayInfoProvider() {
 }
 
 }  // namespace extensions