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

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

Issue 262163002: Disable flaky RepeatedQuickOverscrollGestures test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | 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 598 matching lines...) Expand 10 before | Expand all | Expand 10 after
609 aura::test::EventGenerator generator(content->GetRootWindow(), content); 609 aura::test::EventGenerator generator(content->GetRootWindow(), content);
610 generator.GestureScrollSequence( 610 generator.GestureScrollSequence(
611 gfx::Point(bounds.x() + 2, bounds.y() + 10), 611 gfx::Point(bounds.x() + 2, bounds.y() + 10),
612 gfx::Point(bounds.right() - 10, bounds.y() + 10), 612 gfx::Point(bounds.right() - 10, bounds.y() + 10),
613 base::TimeDelta::FromMilliseconds(20), 613 base::TimeDelta::FromMilliseconds(20),
614 1); 614 1);
615 615
616 delete web_contents->GetContentNativeView(); 616 delete web_contents->GetContentNativeView();
617 } 617 }
618 618
619 // TODO(dalecurtis): Test disabled due to flakiness. http://crbug.com/369871.
619 IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest, 620 IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest,
620 RepeatedQuickOverscrollGestures) { 621 DISABLED_RepeatedQuickOverscrollGestures) {
621 ASSERT_NO_FATAL_FAILURE( 622 ASSERT_NO_FATAL_FAILURE(
622 StartTestWithPage("files/overscroll_navigation.html")); 623 StartTestWithPage("files/overscroll_navigation.html"));
623 624
624 WebContentsImpl* web_contents = 625 WebContentsImpl* web_contents =
625 static_cast<WebContentsImpl*>(shell()->web_contents()); 626 static_cast<WebContentsImpl*>(shell()->web_contents());
626 NavigationController& controller = web_contents->GetController(); 627 NavigationController& controller = web_contents->GetController();
627 RenderFrameHost* main_frame = web_contents->GetMainFrame(); 628 RenderFrameHost* main_frame = web_contents->GetMainFrame();
628 WebContentsViewAura* view_aura = static_cast<WebContentsViewAura*>( 629 WebContentsViewAura* view_aura = static_cast<WebContentsViewAura*>(
629 web_contents->GetView()); 630 web_contents->GetView());
630 view_aura->SetupOverlayWindowForTesting(); 631 view_aura->SetupOverlayWindowForTesting();
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
668 10); 669 10);
669 base::string16 actual_title = title_watcher.WaitAndGetTitle(); 670 base::string16 actual_title = title_watcher.WaitAndGetTitle();
670 EXPECT_EQ(expected_title, actual_title); 671 EXPECT_EQ(expected_title, actual_title);
671 672
672 EXPECT_EQ(2, GetCurrentIndex()); 673 EXPECT_EQ(2, GetCurrentIndex());
673 EXPECT_TRUE(controller.CanGoBack()); 674 EXPECT_TRUE(controller.CanGoBack());
674 EXPECT_FALSE(controller.CanGoForward()); 675 EXPECT_FALSE(controller.CanGoForward());
675 } 676 }
676 677
677 } // namespace content 678 } // 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