diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-08-01 11:44:21 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-08-01 09:49:25 +0000 |
| commit | 9a05d0e4db172168e429f30bc8ed62b695006490 (patch) | |
| tree | 6a7a6b2f7e3410bb9ddc3ef9a200156f2bf623e1 /chromium/chrome/browser/extensions/api | |
| parent | 6ec7b8da05d21a3878bd21c691b41e675d74bb1c (diff) | |
| download | qtwebengine-chromium-9a05d0e4db172168e429f30bc8ed62b695006490.tar.gz | |
BASELINE: Update Chromium to 60.0.3112.78
Change-Id: I58f9d14bddb9104a666b6ef869944111ee7eadb8
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/chrome/browser/extensions/api')
| -rw-r--r-- | chromium/chrome/browser/extensions/api/automation/automation_apitest.cc | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/chromium/chrome/browser/extensions/api/automation/automation_apitest.cc b/chromium/chrome/browser/extensions/api/automation/automation_apitest.cc index 2479fa6aca6..5e299f0d067 100644 --- a/chromium/chrome/browser/extensions/api/automation/automation_apitest.cc +++ b/chromium/chrome/browser/extensions/api/automation/automation_apitest.cc @@ -31,6 +31,7 @@ #include "ui/accessibility/ax_tree.h" #include "ui/accessibility/ax_tree_serializer.h" #include "ui/accessibility/tree_generator.h" +#include "ui/display/display_switches.h" #if defined(OS_CHROMEOS) #include "ash/accelerators/accelerator_controller.h" @@ -298,4 +299,22 @@ IN_PROC_BROWSER_TEST_F(AutomationApiTest, HitTest) { << message_; } +#if defined(OS_CHROMEOS) + +class AutomationApiTestWithDeviceScaleFactor : public AutomationApiTest { + protected: + void SetUpCommandLine(base::CommandLine* command_line) override { + AutomationApiTest::SetUpCommandLine(command_line); + command_line->AppendSwitchASCII(switches::kForceDeviceScaleFactor, "2.0"); + } +}; + +IN_PROC_BROWSER_TEST_F(AutomationApiTestWithDeviceScaleFactor, LocationScaled) { + StartEmbeddedTestServer(); + ASSERT_TRUE(RunPlatformAppTest("automation/tests/location_scaled")) + << message_; +} + +#endif // defined(OS_CHROMEOS) + } // namespace extensions |