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

Side by Side Diff: extensions/browser/guest_view/web_view/web_view_apitest.cc

Issue 655783002: Attempt to fix flaky ChromeOS test timeouts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 | « chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc ('k') | no next file » | 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 "extensions/browser/guest_view/web_view/web_view_apitest.h" 5 #include "extensions/browser/guest_view/web_view/web_view_apitest.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); 264 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
265 command_line->AppendSwitchASCII(switches::kForceDeviceScaleFactor, 265 command_line->AppendSwitchASCII(switches::kForceDeviceScaleFactor,
266 base::StringPrintf("%f", scale())); 266 base::StringPrintf("%f", scale()));
267 WebViewAPITest::SetUp(); 267 WebViewAPITest::SetUp();
268 } 268 }
269 269
270 content::WebContents* WebViewAPITest::GetGuestWebContents() { 270 content::WebContents* WebViewAPITest::GetGuestWebContents() {
271 return GetGuestViewManager()->WaitForSingleGuestCreated(); 271 return GetGuestViewManager()->WaitForSingleGuestCreated();
272 } 272 }
273 273
274 // Occasionally hits NOTIMPLEMENTED on Linux. https://crbug.com/422998 274 IN_PROC_BROWSER_TEST_F(WebViewAPITest, AcceptTouchEvents) {
275 #if defined(OS_LINUX)
276 #define MAYBE_AcceptTouchEvents DISABLED_AcceptTouchEvents
277 #else
278 #define MAYBE_AcceptTouchEvents AcceptTouchEvents
279 #endif
280 IN_PROC_BROWSER_TEST_F(WebViewAPITest, MAYBE_AcceptTouchEvents) {
281 LaunchApp("web_view/accept_touch_events"); 275 LaunchApp("web_view/accept_touch_events");
282 276
283 content::RenderViewHost* embedder_rvh = 277 content::RenderViewHost* embedder_rvh =
284 GetEmbedderWebContents()->GetRenderViewHost(); 278 GetEmbedderWebContents()->GetRenderViewHost();
285 279
286 bool embedder_has_touch_handler = 280 bool embedder_has_touch_handler =
287 content::RenderViewHostTester::HasTouchEventHandler(embedder_rvh); 281 content::RenderViewHostTester::HasTouchEventHandler(embedder_rvh);
288 EXPECT_FALSE(embedder_has_touch_handler); 282 EXPECT_FALSE(embedder_has_touch_handler);
289 283
290 SendMessageToGuestAndWait("install-touch-handler", "installed-touch-handler"); 284 SendMessageToGuestAndWait("install-touch-handler", "installed-touch-handler");
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after
669 // object, on the webview element, and hanging directly off webview. 663 // object, on the webview element, and hanging directly off webview.
670 IN_PROC_BROWSER_TEST_F(WebViewAPITest, TestWebRequestAPIExistence) { 664 IN_PROC_BROWSER_TEST_F(WebViewAPITest, TestWebRequestAPIExistence) {
671 RunTest("testWebRequestAPIExistence", "web_view/apitest"); 665 RunTest("testWebRequestAPIExistence", "web_view/apitest");
672 } 666 }
673 667
674 IN_PROC_BROWSER_TEST_F(WebViewAPITest, TestWebRequestAPIGoogleProperty) { 668 IN_PROC_BROWSER_TEST_F(WebViewAPITest, TestWebRequestAPIGoogleProperty) {
675 RunTest("testWebRequestAPIGoogleProperty", "web_view/apitest"); 669 RunTest("testWebRequestAPIGoogleProperty", "web_view/apitest");
676 } 670 }
677 671
678 } // namespace extensions 672 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698