Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(182)

Side by Side Diff: chrome/browser/extensions/api/automation/automation_apitest.cc

Issue 2867103005: Merge to M59: Revert "Fix computation of Automation API location offsets in WebViews." (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/extensions/api/automation_internal/automation_internal_api.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/files/file_path.h" 5 #include "base/files/file_path.h"
6 #include "base/location.h" 6 #include "base/location.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/single_thread_task_runner.h" 8 #include "base/single_thread_task_runner.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/threading/thread_task_runner_handle.h" 10 #include "base/threading/thread_task_runner_handle.h"
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopFocusViews) { 203 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopFocusViews) {
204 AutomationManagerAura::GetInstance()->Enable(browser()->profile()); 204 AutomationManagerAura::GetInstance()->Enable(browser()->profile());
205 // Trigger the shelf subtree to be computed. 205 // Trigger the shelf subtree to be computed.
206 ash::Shell::Get()->accelerator_controller()->PerformActionIfEnabled( 206 ash::Shell::Get()->accelerator_controller()->PerformActionIfEnabled(
207 ash::FOCUS_SHELF); 207 ash::FOCUS_SHELF);
208 208
209 ASSERT_TRUE( 209 ASSERT_TRUE(
210 RunExtensionSubtest("automation/tests/desktop", "focus_views.html")) 210 RunExtensionSubtest("automation/tests/desktop", "focus_views.html"))
211 << message_; 211 << message_;
212 } 212 }
213
214 IN_PROC_BROWSER_TEST_F(AutomationApiTest, LocationInWebView) {
215 StartEmbeddedTestServer();
216 ASSERT_TRUE(RunPlatformAppTest("automation/tests/webview")) << message_;
217 }
218 #endif 213 #endif
219 214
220 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopNotRequested) { 215 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopNotRequested) {
221 ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs", 216 ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs",
222 "desktop_not_requested.html")) << message_; 217 "desktop_not_requested.html")) << message_;
223 } 218 }
224 219
225 #if defined(OS_CHROMEOS) 220 #if defined(OS_CHROMEOS)
226 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopActions) { 221 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopActions) {
227 AutomationManagerAura::GetInstance()->Enable(browser()->profile()); 222 AutomationManagerAura::GetInstance()->Enable(browser()->profile());
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 << message_; 280 << message_;
286 } 281 }
287 282
288 IN_PROC_BROWSER_TEST_F(AutomationApiTest, HitTest) { 283 IN_PROC_BROWSER_TEST_F(AutomationApiTest, HitTest) {
289 StartEmbeddedTestServer(); 284 StartEmbeddedTestServer();
290 ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs", "hit_test.html")) 285 ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs", "hit_test.html"))
291 << message_; 286 << message_;
292 } 287 }
293 288
294 } // namespace extensions 289 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/api/automation_internal/automation_internal_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698