- Plumbs through native touch calibration from MD settings to display manager via the system dis…

extensions/browser/api/system_display/system_display_apitest.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 <stdint.h>
 
 #include <set>
 #include <utility>
 
 #include "base/debug/leak_annotations.h"
 #include "base/macros.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "extensions/browser/api/system_display/display_info_provider.h"
 #include "extensions/browser/api/system_display/system_display_api.h"
 #include "extensions/browser/api_test_utils.h"
 #include "extensions/common/api/system_display.h"
 #include "extensions/shell/test/shell_apitest.h"
 #include "extensions/test/result_catcher.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 
@@ skipping 110 matching lines @@
   bool unified_desktop_enabled() const { return unified_desktop_enabled_; }
 
   bool calibration_started(const std::string& id) const {
     return base::ContainsKey(overscan_started_, id);
   }
 
   bool calibration_changed(const std::string& id) const {
     return base::ContainsKey(overscan_adjusted_, id);
   }
 
+  void SetTouchCalibrationWillSucceed(bool success) {
+    native_touch_calibration_success_ = success;
+  }
+
+  bool IsNativeTouchCalibrationActive(std::string* error) override {
+    return false;
+  }
+
+  bool ShowNativeTouchCalibration(
+      const std::string& id,
+      std::string* error,
+      const DisplayInfoProvider::TouchCalibrationCallback& callback) override {
+    base::ThreadTaskRunnerHandle::Get()->PostTask(
+        FROM_HERE, base::Bind(callback, native_touch_calibration_success_));
+    return true;
+  }
+
  private:
   // Update the content of the |unit| obtained for |display| using
   // platform specific method.
   void UpdateDisplayUnitInfoForPlatform(
       const display::Display& display,
       extensions::api::system_display::DisplayUnitInfo* unit) override {
     int64_t id = display.id();
     unit->name = "DISPLAY NAME FOR " + base::Int64ToString(id);
     if (id == 1)
       unit->mirroring_source_id = "0";
@@ skipping 10 matching lines @@
       unit->overscan.bottom = 80;
     }
   }
 
   std::unique_ptr<base::DictionaryValue> set_info_value_;
   std::string set_info_display_id_;
   bool unified_desktop_enabled_ = false;
   std::set<std::string> overscan_started_;
   std::set<std::string> overscan_adjusted_;
 
+  bool native_touch_calibration_success_ = false;
+
   DISALLOW_COPY_AND_ASSIGN(MockDisplayInfoProvider);
 };
 
 class SystemDisplayApiTest : public ShellApiTest {
  public:
   SystemDisplayApiTest()
       : provider_(new MockDisplayInfoProvider), screen_(new MockScreen) {}
 
   ~SystemDisplayApiTest() override {}
 
@@ skipping 216 matching lines @@
 
   // Calibration was started by the app but not completed.
   ASSERT_TRUE(provider_->calibration_started(id));
 
   // Unloading the app should complete the calibraiton (and hide the overlay).
   UnloadApp(extension);
   ASSERT_FALSE(provider_->calibration_changed(id));
   ASSERT_FALSE(provider_->calibration_started(id));
 }
 
+IN_PROC_BROWSER_TEST_F(SystemDisplayApiTest, ShowNativeTouchCalibrationFail) {
+  const std::string id = "display0";
+  std::unique_ptr<base::DictionaryValue> test_extension_value(
+      api_test_utils::ParseDictionary(kTestManifestKiosk));
+  scoped_refptr<Extension> test_extension(
+      api_test_utils::CreateExtension(test_extension_value.get()));
+
+  scoped_refptr<SystemDisplayShowNativeTouchCalibrationFunction>
+      show_native_calibration(
+          new SystemDisplayShowNativeTouchCalibrationFunction());
+
+  show_native_calibration->set_has_callback(true);
+  show_native_calibration->set_extension(test_extension.get());
+
+  provider_->SetTouchCalibrationWillSucceed(false);
+
+  std::string result(api_test_utils::RunFunctionAndReturnError(
+      show_native_calibration.get(), "[\"" + id + "\"]", browser_context()));
+
+  EXPECT_EQ(
+      result,
+      SystemDisplayShowNativeTouchCalibrationFunction::kTouchCalibrationError);
+}
+
+IN_PROC_BROWSER_TEST_F(SystemDisplayApiTest, ShowNativeTouchCalibration) {
+  const std::string id = "display0";
+  std::unique_ptr<base::DictionaryValue> test_extension_value(
+      api_test_utils::ParseDictionary(kTestManifestKiosk));
+  scoped_refptr<Extension> test_extension(
+      api_test_utils::CreateExtension(test_extension_value.get()));
+
+  scoped_refptr<SystemDisplayShowNativeTouchCalibrationFunction>
+      show_native_calibration(
+          new SystemDisplayShowNativeTouchCalibrationFunction());
+
+  show_native_calibration->set_has_callback(true);
+  show_native_calibration->set_extension(test_extension.get());
+
+  provider_->SetTouchCalibrationWillSucceed(true);
+
+  std::unique_ptr<base::Value> result(
+      api_test_utils::RunFunctionAndReturnSingleResult(
+          show_native_calibration.get(), "[\"" + id + "\"]",
+          browser_context()));
+
+  bool callback_result;
+  ASSERT_TRUE(result->GetAsBoolean(&callback_result));
+  ASSERT_TRUE(callback_result);
+}
+
 #endif  // !defined(OS_CHROMEOS)
 
 }  // namespace extensions