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

Side by Side Diff: content/browser/web_contents/web_contents_view_aura_browsertest.cc

Issue 490223002: OverscrollScreenshot is marked as FLAKY. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/browser/web_contents/web_contents_view_aura.h" 5 #include "content/browser/web_contents/web_contents_view_aura.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "base/test/test_timeouts.h" 10 #include "base/test/test_timeouts.h"
(...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 } 501 }
502 502
503 // Tests that the page has has a screenshot when navigation happens: 503 // Tests that the page has has a screenshot when navigation happens:
504 // - from within the page (from a JS function) 504 // - from within the page (from a JS function)
505 // - interactively, when user does an overscroll gesture 505 // - interactively, when user does an overscroll gesture
506 // - interactively, when user navigates in history without the overscroll 506 // - interactively, when user navigates in history without the overscroll
507 // gesture. 507 // gesture.
508 // Flaky on Windows (http://crbug.com/357311). Might be related to 508 // Flaky on Windows (http://crbug.com/357311). Might be related to
509 // OverscrollNavigation test. 509 // OverscrollNavigation test.
510 // Flaky on Ozone (http://crbug.com/399676). 510 // Flaky on Ozone (http://crbug.com/399676).
511 #if defined(OS_WIN) || defined(USE_OZONE) 511 // Flaky on ChromeOS (http://crbug.com/405945).
512 #if defined(OS_WIN) || defined(USE_OZONE) || defined(OS_CHROMEOS)
512 #define MAYBE_OverscrollScreenshot DISABLED_OverscrollScreenshot 513 #define MAYBE_OverscrollScreenshot DISABLED_OverscrollScreenshot
513 #else 514 #else
514 #define MAYBE_OverscrollScreenshot OverscrollScreenshot 515 #define MAYBE_OverscrollScreenshot OverscrollScreenshot
515 #endif 516 #endif
516 IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest, MAYBE_OverscrollScreenshot) { 517 IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest, MAYBE_OverscrollScreenshot) {
517 // Disable the test for WinXP. See http://crbug/294116. 518 // Disable the test for WinXP. See http://crbug/294116.
518 #if defined(OS_WIN) 519 #if defined(OS_WIN)
519 if (base::win::GetVersion() < base::win::VERSION_VISTA) { 520 if (base::win::GetVersion() < base::win::VERSION_VISTA) {
520 LOG(WARNING) << "Test disabled due to unknown bug on WinXP."; 521 LOG(WARNING) << "Test disabled due to unknown bug on WinXP.";
521 return; 522 return;
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
959 WaitAFrame(); 960 WaitAFrame();
960 961
961 if (!navigated) 962 if (!navigated)
962 EXPECT_EQ(10, ExecuteScriptAndExtractInt("touchmoveCount")); 963 EXPECT_EQ(10, ExecuteScriptAndExtractInt("touchmoveCount"));
963 else 964 else
964 EXPECT_GT(10, ExecuteScriptAndExtractInt("touchmoveCount")); 965 EXPECT_GT(10, ExecuteScriptAndExtractInt("touchmoveCount"));
965 } 966 }
966 } 967 }
967 968
968 } // namespace content 969 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698